diff --git a/YuMi/CustomUI/SVGA/XPSVGAPlayer.m b/YuMi/CustomUI/SVGA/XPSVGAPlayer.m index 2be42387..ebc30111 100644 --- a/YuMi/CustomUI/SVGA/XPSVGAPlayer.m +++ b/YuMi/CustomUI/SVGA/XPSVGAPlayer.m @@ -85,7 +85,7 @@ self.loopCount = 0; self.displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(next)]; - self.displayLink.preferredFramesPerSecond = 60 / self.videoItem.FPS; + self.displayLink.preferredFramesPerSecond = self.videoItem.FPS; [self.displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; self.forwardAnimating = !self.reversing; } @@ -154,7 +154,7 @@ if (andPlay) { self.forwardAnimating = YES; self.displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(next)]; - self.displayLink.frameInterval = 60 / self.videoItem.FPS; + self.displayLink.preferredFramesPerSecond = self.videoItem.FPS; [self.displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; } } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentChatHallHeadView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentChatHallHeadView.m index c523c530..076decaa 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentChatHallHeadView.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentChatHallHeadView.m @@ -31,7 +31,7 @@ @property(nonatomic,strong) UILabel *nameView; -@property(nonatomic,strong) NetImageView *experImage; +@property(nonatomic,strong) NetImageView *expertImage; @property(nonatomic,strong) NetImageView *charmImage; @property (nonatomic, strong) SVGAParser *parser; @@ -53,7 +53,7 @@ [self addSubview:self.headWearImageView]; [self addSubview:self.headWearSVGAImageView]; [self addSubview:self.nameView]; - [self addSubview:self.experImage]; + [self addSubview:self.expertImage]; [self addSubview:self.charmImage]; } -(void)installConstraints{ @@ -73,10 +73,10 @@ make.top.mas_equalTo(kGetScaleWidth(21)); make.height.mas_equalTo(kGetScaleWidth(18)); make.trailing.mas_equalTo(-kGetScaleWidth(72)); - make.leading.equalTo(self.experImage.mas_trailing).mas_offset(kGetScaleWidth(4)); + make.leading.equalTo(self.expertImage.mas_trailing).mas_offset(kGetScaleWidth(4)); }]; - [self.experImage mas_makeConstraints:^(MASConstraintMaker *make) { + [self.expertImage mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(36)); make.height.mas_equalTo(kGetScaleWidth(18)); make.leading.equalTo(self.charmImage.mas_trailing).mas_offset(kGetScaleWidth(4)); @@ -105,10 +105,10 @@ make.top.mas_equalTo(kGetScaleWidth(21)); make.height.mas_equalTo(kGetScaleWidth(18)); make.leading.mas_equalTo(kGetScaleWidth(72)); - make.trailing.equalTo(self.experImage.mas_leading).mas_offset(-kGetScaleWidth(4)); + make.trailing.equalTo(self.expertImage.mas_leading).mas_offset(-kGetScaleWidth(4)); }]; - [self.experImage mas_makeConstraints:^(MASConstraintMaker *make) { + [self.expertImage mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(36)); make.height.mas_equalTo(kGetScaleWidth(18)); make.trailing.equalTo(self.charmImage.mas_leading).mas_offset(-kGetScaleWidth(4)); @@ -139,10 +139,10 @@ @kStrongify(self); self.avatarView.image = image; }]; - self.experImage.image = nil; - [self.experImage loadImageWithUrl:extModel.experUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { + self.expertImage.image = nil; + [self.expertImage loadImageWithUrl:extModel.experUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { @kStrongify(self); - self.experImage.image = image; + self.expertImage.image = image; }]; self.charmImage.image = nil; [self.charmImage loadImageWithUrl:extModel.charmUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { @@ -231,11 +231,11 @@ } return _manager; } -- (NetImageView *)experImage{ - if(!_experImage){ - _experImage = [NetImageView new]; +- (NetImageView *)expertImage{ + if(!_expertImage){ + _expertImage = [NetImageView new]; } - return _experImage; + return _expertImage; } - (NetImageView *)charmImage{ if(!_charmImage){ diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m index 0ab7f59f..c11f5e05 100644 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m +++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m @@ -579,9 +579,11 @@ - (NetImageView *)avatarImageView { if (!_avatarImageView) { NetImageConfig *config = [[NetImageConfig alloc]init]; - config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; +// config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; _avatarImageView = [[NetImageView alloc] initWithConfig:config]; _avatarImageView.userInteractionEnabled = YES; + _avatarImageView.layer.opaque = NO; + _avatarImageView.opaque = NO; } return _avatarImageView; } diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index a35b5c4d..f46950a5 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -259,7 +259,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 } - (void)dealloc { -#warning to dox - 时刻注意这个方法 功能做完的时候删除此方法 + NSLog(@"房间销毁了"); if(timer != nil){ [timer fire]; @@ -692,25 +692,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 belowSubview:self.roomHeaderView]; } - if (self.stageView.alpha == 0) { - self.stageView.transform = CGAffineTransformMakeScale(0.1, 0.1); - self.stageView.alpha = 1.0; - - [UIView animateWithDuration:0.5 - delay:0 - usingSpringWithDamping:0.5 - initialSpringVelocity:0.5 - options:UIViewAnimationOptionCurveEaseInOut - animations:^{ - // 动画到原始大小 - self.stageView.transform = CGAffineTransformIdentity; - } completion:nil]; -// [UIView animateWithDuration:2 animations:^{ -// self.stageView.alpha = 1; -// } completion:^(BOOL finished) { -//// self.stageView.hidden = hidden; -// }]; - } + self.stageView.alpha = 1; [self addExitGameButton]; @@ -1206,6 +1188,8 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.backContainerView onRoomEntered]; [self.littleGameView onRoomEntered]; +// return; + self.quickMessageContainerView.titleArray = self.roomInfo.speakTemplate; if ([XPRoomMiniManager shareManager].getRoomInfo.uid != self.roomUid.integerValue) { @@ -1315,12 +1299,15 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 - (void)openRoomSuccess:(RoomInfoModel *)roomInfo { [XNDJTDDLoadingTool hideHUDInView:self.navigationController.view]; [self hideHUD]; + self.roomInfo = roomInfo; + if (roomInfo.type == RoomType_Anchor) { [self handleInitAnchorRoom]; [self showAnchorScrollTipView]; return; } + [self changeStageViewOnRoomUpdate]; [self.roomHeaderView onRoomEntered]; [self.activityContainerView onRoomEntered]; @@ -1329,7 +1316,9 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.littleGameView onRoomEntered]; [self.functionView onRoomEntered]; [self.messageContainerView onRoomEntered]; + self.quickMessageContainerView.titleArray = self.roomInfo.speakTemplate; + [self.presenter enterNIMRoom:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId] user:self.userInfo]; } @@ -1351,8 +1340,8 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [[NSNotificationCenter defaultCenter] postNotificationName:@"kShowGiftView" object:@{@"giftId": self.giftId}]; }); } - } + - (void)enterRoomFail:(NSInteger)code { [XNDJTDDLoadingTool hideHUDInView:self.navigationController.view]; [self hideHUD]; @@ -1475,18 +1464,13 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 } } else { self.roomInfo.datingState = self.roomInfo.roomModeType == RoomModeType_Open_Blind ? RoomDatingStateChangeType_Open : RoomDatingStateChangeType_Normal; + + [self __removeAllViews]; + if (!self.anchorScrollView.superview) { [self.view addSubview:self.anchorScrollView]; } - [self.backContainerView removeFromSuperview]; - [self.stageView removeFromSuperview]; - [self.messageContainerView removeFromSuperview]; - [self.quickMessageContainerView removeFromSuperview]; - [self.activityContainerView removeFromSuperview]; - [self.roomHeaderView removeFromSuperview]; - [self.functionView removeFromSuperview]; - [self.menuContainerView removeFromSuperview]; - + [self.anchorScrollView addSubview:self.backContainerView]; [self.anchorScrollView addSubview:self.stageView]; [self.anchorScrollView addSubview:self.messageContainerView]; @@ -1495,6 +1479,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.anchorScrollView addSubview:self.roomHeaderView]; [self.anchorScrollView addSubview:self.functionView]; [self.anchorScrollView addSubview:self.menuContainerView]; + [self.view bringSubviewToFront:self.animationView]; [self updateViewConstraintsOnAnchorRoom]; @@ -1542,7 +1527,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 } } } -- (void)getRedPacketInftSuccess:(XPRedPacketModel *)redInfo{ +- (void)getRedPacketInfoSuccess:(XPRedPacketModel *)redInfo{ XPReceiveRedPacketView *view = [[XPReceiveRedPacketView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; view.delegate = self; self.isShowRedPacket = YES; @@ -1559,35 +1544,13 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.view addSubview:view]; [self.view bringSubviewToFront:view]; } + - (void)getRedPacketSuccess:(NSArray *)list { - if (list.count == 0) { - return; - } - // for (XPRedPacketModel *data in list) { - // if(data.kind == 0){ - // data.kind = 1; - // } - // if((data.validityType == 0 && data.type == RedPacketType_RoomDiamond && [self isShowRedPacketView:data] == YES) || data.type == RedPacketType_AllDiamond){ - // XPReceiveRedPacketView *view = [[XPReceiveRedPacketView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)]; - // view.receiveModel = data; - // view.delegate = self; - // self.isShowRedPacket = YES; - // for (UIView *subView in self.view.subviews) { - // if([subView isKindOfClass:[XPReceiveRedPacketView class]]) { - // view.alphaView.backgroundColor = [UIColor clearColor]; - // break; - // } - // } - // [self.view addSubview:view]; - // [self.view bringSubviewToFront:view]; - // } - // - // } if(list.count > 0){ self.activityContainerView.redPacketList = [NSMutableArray arrayWithArray:list]; - } } + -(void)getFreeGiftDataSuccess:(XPFreeGiftModel *)freeModel{ self.freeModel = freeModel; self.menuContainerView.freeModel = freeModel; @@ -1634,6 +1597,18 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 } #pragma mark - NIMChatManagerDelegate +- (void)__removeAllViews { + [self.anchorScrollView removeFromSuperview]; + [self.backContainerView removeFromSuperview]; + [self.stageView removeFromSuperview]; + [self.messageContainerView removeFromSuperview]; + [self.quickMessageContainerView removeFromSuperview]; + [self.activityContainerView removeFromSuperview]; + [self.roomHeaderView removeFromSuperview]; + [self.functionView removeFromSuperview]; + [self.menuContainerView removeFromSuperview]; +} + - (void)onRecvMessages:(NSArray *)messages { for (NIMMessage * message in messages) { ///房间内收到p2p的消息 比如升级消息 @@ -1673,9 +1648,10 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 continue; } - if (![message.session.sessionId isEqualToString:[NSString stringWithFormat:@"%ld", self.roomInfo.roomId]]) { + if (![message.session.sessionId isEqualToString:@(self.roomInfo.roomId).stringValue]) { continue; } + if (message.messageType == NIMMessageTypeNotification) { NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject; NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content; @@ -1710,21 +1686,15 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 newRoomInfo.hadChangeRoomType = self.roomInfo.type != newRoomInfo.type; BOOL anchorToOther = newRoomInfo.type != RoomType_Anchor && self.roomInfo.type == RoomType_Anchor;//个播变其他房 self.roomInfo = newRoomInfo; + [self.backContainerView onRoomUpdate]; + self.quickMessageContainerView.titleArray = self.roomInfo.speakTemplate; if (self.roomInfo.type == RoomType_Anchor && self.roomInfo.hadChangeRoomType) {///从其他房变为个播房 [self handleInitAnchorRoom]; [self showAnchorScrollTipView]; } else if (anchorToOther) { - [self.anchorScrollView removeFromSuperview]; - [self.backContainerView removeFromSuperview]; - [self.stageView removeFromSuperview]; - [self.messageContainerView removeFromSuperview]; - [self.quickMessageContainerView removeFromSuperview]; - [self.activityContainerView removeFromSuperview]; - [self.roomHeaderView removeFromSuperview]; - [self.functionView removeFromSuperview]; - [self.menuContainerView removeFromSuperview]; + [self __removeAllViews]; [self.view addSubview:self.backContainerView]; [self.view addSubview:self.stageView]; @@ -1736,6 +1706,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.view addSubview:self.functionView]; [self.view bringSubviewToFront:self.menuContainerView]; [self.view bringSubviewToFront:self.animationView]; + [self initSubViewConstraints]; [self changeStageViewOnRoomUpdate]; [self.stageView onRoomUpdate]; @@ -2391,16 +2362,10 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [TTPopup dismiss]; view.isPwdError = NO; if (self.roomInfo.type == RoomType_Anchor) { + [self __removeAllViews]; if (!self.anchorScrollView.superview) { [self.view insertSubview:self.anchorScrollView belowSubview:self.menuContainerView]; } - [self.backContainerView removeFromSuperview]; - [self.stageView removeFromSuperview]; - [self.messageContainerView removeFromSuperview]; - [self.quickMessageContainerView removeFromSuperview]; - [self.activityContainerView removeFromSuperview]; - [self.roomHeaderView removeFromSuperview]; - [self.functionView removeFromSuperview]; [self.anchorScrollView addSubview:self.backContainerView]; [self.anchorScrollView addSubview:self.stageView]; diff --git a/YuMi/Modules/YMWeb/XPWebViewController.m b/YuMi/Modules/YMWeb/XPWebViewController.m index 848e7c75..3e1e9a55 100644 --- a/YuMi/Modules/YMWeb/XPWebViewController.m +++ b/YuMi/Modules/YMWeb/XPWebViewController.m @@ -97,6 +97,8 @@ typedef NS_ENUM(NSUInteger, RightNavigationPushType){ /// 订单编号 @property (nonatomic,copy) NSString *orderId; +@property (nonatomic, assign) BOOL isHideNavBar; + @end NSString * const kJSOpenPurse = @"openPurse"; @@ -132,7 +134,6 @@ NSString * const kJSOpenPaymentCallback = @"openPaymentCallback"; self = [super init]; if (self) { self.isCustom = isCustom; - } return self; } @@ -144,6 +145,11 @@ NSString * const kJSOpenPaymentCallback = @"openPaymentCallback"; [XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge = YES; } + if (self.isHideNavBar) { + if (self.navigationController) { + [self.navigationController setNavigationBarHidden:YES]; + } + } } - (void)viewDidLoad { @@ -151,18 +157,14 @@ NSString * const kJSOpenPaymentCallback = @"openPaymentCallback"; [self.view addSubview:self.saveView]; self.saveView.hidden = YES; [self initView]; - - - } + - (void)saveImageToPhotoAlbum:(NSDictionary *)data{ - if (data.allKeys.count == 0){ [self showSuccessToast:YMLocalizedString(@"PIWebViewSavePhotoView3")]; return; } - - + NSString *qrCodeUrl = data[@"qrCodeUrl"]; if (qrCodeUrl.length == 0){ [self showSuccessToast:YMLocalizedString(@"PIWebViewSavePhotoView3")]; @@ -170,7 +172,9 @@ NSString * const kJSOpenPaymentCallback = @"openPaymentCallback"; } [self showLoading]; NetImageView *imageView = [NetImageView new]; + @kWeakify(self); [imageView loadImageWithUrl:qrCodeUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { + @kStrongify(self); [self hideHUD]; if (image != nil){ self.saveView.hidden = NO; @@ -185,8 +189,6 @@ NSString * const kJSOpenPaymentCallback = @"openPaymentCallback"; } [self showSuccessToast:YMLocalizedString(@"PIWebViewSavePhotoView3")]; }]; - - } //指定回调方法 @@ -205,17 +207,12 @@ NSString * const kJSOpenPaymentCallback = @"openPaymentCallback"; leftBarButtonItem.tintColor = [DJDKMIMOMColor mainTextColor]; self.navigationItem.leftBarButtonItem = leftBarButtonItem; - - } - if (@available(iOS 11.0, *)) { - self.webview.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - }else{ - self.automaticallyAdjustsScrollViewInsets = NO; - } - if(self.isCustom == YES){ - [self.view addSubview:self.navView]; + self.webview.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; + + if(self.isCustom == YES){ + [self.view addSubview:self.navView]; [self.view addSubview:self.webview]; [self.view addSubview:self.progressView]; [self.navView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -241,12 +238,13 @@ NSString * const kJSOpenPaymentCallback = @"openPaymentCallback"; NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; + @kWeakify(self); [Api getUserWalletInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + @kStrongify(self); if(code == 200){ WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data]; self.model = model; } - } uid:uid ticket:ticket]; } - (void)xPWebViewNavView:(XPWebViewNavView *)view didClickBack:(UIButton *)sender{ @@ -414,6 +412,7 @@ NSString * const kJSOpenPaymentCallback = @"openPaymentCallback"; self.InitShowNavBlock(YES); return; } + self.isHideNavBar = YES; if (self.navigationController) { [self.navigationController setNavigationBarHidden:YES]; } @@ -486,8 +485,8 @@ NSString * const kJSOpenPaymentCallback = @"openPaymentCallback"; [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if ([obj isKindOfClass:[XPRoomViewController class]]) { [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController popToRootViewControllerAnimated:NO]; - XPRoomViewController * rooomVC = obj; - [rooomVC exitRoom]; + XPRoomViewController * roomVC = obj; + [roomVC exitRoom]; *stop = YES; } }]; @@ -755,65 +754,65 @@ NSString * const kJSOpenPaymentCallback = @"openPaymentCallback"; [self.webview loadRequest:request]; } - (void)backButtonClick { - BOOL canGoBack = YES; - if (self.webview.backForwardList.backList.count <= 1) { - canGoBack = NO; - } + BOOL canGoBack = YES; + if (self.webview.backForwardList.backList.count <= 1) { + canGoBack = NO; + } - if ([self.webview canGoBack]) { - [self.webview goBack]; - } else { - [self.navigationController popViewControllerAnimated:YES]; - [self.pi_userContentController removeAllUserScripts]; - } + if ([self.webview canGoBack]) { + [self.webview goBack]; + } else { + [self.navigationController popViewControllerAnimated:YES]; + [self.pi_userContentController removeAllUserScripts]; + } } #pragma mark - 分享 - (void)initNav:(NSDictionary *)response{ - if(!response || ![response isKindOfClass:[NSDictionary class]])return; - self.shareDic = response[@"data"]; - if ([response[@"type"] intValue]== RightNavigationPushType_Web) { - [self addNavigationItemWithTitles:@[response[@"data"][@"title"]] titleColor:[DJDKMIMOMColor alertTitleColor] isLeft:NO target:self action:@selector(gotoWebView) tags:nil]; - }else if ([response[@"type"] intValue]== RightNavigationPushType_Share || [response[@"type"] intValue]== RightNavigationPushType_SharePicture){ - [self addNavigationItemWithImageNames:@[@"family_person_share"] isLeft:NO - target:self action:@selector(showSharePanel) tags:nil]; - } + if(!response || ![response isKindOfClass:[NSDictionary class]])return; + self.shareDic = response[@"data"]; + if ([response[@"type"] intValue]== RightNavigationPushType_Web) { + [self addNavigationItemWithTitles:@[response[@"data"][@"title"]] titleColor:[DJDKMIMOMColor alertTitleColor] isLeft:NO target:self action:@selector(gotoWebView) tags:nil]; + }else if ([response[@"type"] intValue]== RightNavigationPushType_Share || [response[@"type"] intValue]== RightNavigationPushType_SharePicture){ + [self addNavigationItemWithImageNames:@[@"family_person_share"] isLeft:NO + target:self action:@selector(showSharePanel) tags:nil]; + } } - (void)gotoWebView { - if (self.shareDic[@"link"]) { - XPWebViewController * webVC = [[XPWebViewController alloc] init]; - webVC.url = self.shareDic[@"link"]; - [self.navigationController pushViewController:webVC animated:YES]; - } + if (self.shareDic[@"link"]) { + XPWebViewController * webVC = [[XPWebViewController alloc] init]; + webVC.url = self.shareDic[@"link"]; + [self.navigationController pushViewController:webVC animated:YES]; + } } -(void)showShareSavePhote{ - if (self.savePhotoDic.allKeys.count <= 0) { - return; - } - NSDictionary * dic = self.savePhotoDic; - XPShareInfoModel * shareInfo = [[XPShareInfoModel alloc] init]; - shareInfo.shareContent = dic[@"shareText"]; - shareInfo.type = ShareType_H5; - shareInfo.uid = [AccountInfoStorage instance].getUid; - NSString *urlStr = ((NSString *)dic[@"toUrl"]).length > 0 ? dic[@"toUrl"] : @""; - NSString *title = ((NSString *)dic[@"shareTitle"]).length > 0 ? dic[@"shareTitle"] : @""; - NSString *shareText = ((NSString *)dic[@"shareText"]).length > 0 ? dic[@"shareText"] : @""; - NSString *shareImg = ((NSString *)dic[@"shareImg"]).length > 0 ? dic[@"shareImg"] : @""; - shareInfo.shareUrl = [NSString stringWithFormat:@"%@&image=%@&title=%@&subTitle=%@",urlStr,shareImg,title,shareText]; - XPShareItem *cycle = [XPShareItem itemWitTag:XPShareItemTagFaceBook title:@"FaceBook" imageName:@"share_fb" disableImageName:@"share_fb"]; - XPShareItem *wechat = [XPShareItem itemWitTag:XPShareItemTagLine title:@"Line" imageName:@"share_line" disableImageName:@"share_line"]; - wechat.isShareInvite = YES; - wechat.inviteTitle = title; - XPShareItem *qq = [XPShareItem itemWitTag:XPShareItemTagCopyLink title:YMLocalizedString(@"XPWebViewNavView1") imageName:@"share_copy_link" disableImageName:@"share_copy_link"]; - XPShareItem *save = [XPShareItem itemWitTag:XPShareItemTagAppSaveAlbum title:YMLocalizedString(@"PIWebViewSavePhotoView4") imageName:@"share_save_icon" disableImageName:@"share_save_icon"]; - - NSArray * items = @[wechat,cycle, qq,save]; - CGFloat margin = 15; - CGSize itemSize = CGSizeMake((KScreenWidth-2*margin)/4, 65); - XPShareView *shareView = [[XPShareView alloc] initWithItems:items itemSize:itemSize shareInfo:shareInfo]; - shareView.delegate = self; + if (self.savePhotoDic.allKeys.count <= 0) { + return; + } + NSDictionary * dic = self.savePhotoDic; + XPShareInfoModel * shareInfo = [[XPShareInfoModel alloc] init]; + shareInfo.shareContent = dic[@"shareText"]; + shareInfo.type = ShareType_H5; + shareInfo.uid = [AccountInfoStorage instance].getUid; + NSString *urlStr = ((NSString *)dic[@"toUrl"]).length > 0 ? dic[@"toUrl"] : @""; + NSString *title = ((NSString *)dic[@"shareTitle"]).length > 0 ? dic[@"shareTitle"] : @""; + NSString *shareText = ((NSString *)dic[@"shareText"]).length > 0 ? dic[@"shareText"] : @""; + NSString *shareImg = ((NSString *)dic[@"shareImg"]).length > 0 ? dic[@"shareImg"] : @""; + shareInfo.shareUrl = [NSString stringWithFormat:@"%@&image=%@&title=%@&subTitle=%@",urlStr,shareImg,title,shareText]; + XPShareItem *cycle = [XPShareItem itemWitTag:XPShareItemTagFaceBook title:@"FaceBook" imageName:@"share_fb" disableImageName:@"share_fb"]; + XPShareItem *wechat = [XPShareItem itemWitTag:XPShareItemTagLine title:@"Line" imageName:@"share_line" disableImageName:@"share_line"]; + wechat.isShareInvite = YES; + wechat.inviteTitle = title; + XPShareItem *qq = [XPShareItem itemWitTag:XPShareItemTagCopyLink title:YMLocalizedString(@"XPWebViewNavView1") imageName:@"share_copy_link" disableImageName:@"share_copy_link"]; + XPShareItem *save = [XPShareItem itemWitTag:XPShareItemTagAppSaveAlbum title:YMLocalizedString(@"PIWebViewSavePhotoView4") imageName:@"share_save_icon" disableImageName:@"share_save_icon"]; - [TTPopup popupView:shareView style:TTPopupStyleActionSheet]; + NSArray * items = @[wechat,cycle, qq,save]; + CGFloat margin = 15; + CGSize itemSize = CGSizeMake((KScreenWidth-2*margin)/4, 65); + XPShareView *shareView = [[XPShareView alloc] initWithItems:items itemSize:itemSize shareInfo:shareInfo]; + shareView.delegate = self; + + [TTPopup popupView:shareView style:TTPopupStyleActionSheet]; } - (void)showSharePanel {