diff --git a/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/Contents.json b/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/Contents.json index 1f4ac8f4..d100c9f0 100644 --- a/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/Contents.json +++ b/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/Contents.json @@ -5,12 +5,11 @@ "scale" : "1x" }, { - "filename" : "mine_user_info_edit_self@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "mine_user_info_edit_self@3x.png", + "filename" : "切图 12@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/mine_user_info_edit_self@2x.png b/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/mine_user_info_edit_self@2x.png deleted file mode 100644 index eb1cdc55..00000000 Binary files a/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/mine_user_info_edit_self@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/mine_user_info_edit_self@3x.png b/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/mine_user_info_edit_self@3x.png deleted file mode 100644 index 538c800c..00000000 Binary files a/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/mine_user_info_edit_self@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/切图 12@3x.png b/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/切图 12@3x.png new file mode 100644 index 00000000..e362a24a Binary files /dev/null and b/YuMi/Assets.xcassets/jm/mine_user_info_edit_self.imageset/切图 12@3x.png differ diff --git a/YuMi/Modules/YMMine/Presenter/XPMineRechargePresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineRechargePresenter.m index 66df1ad3..61679b1f 100644 --- a/YuMi/Modules/YMMine/Presenter/XPMineRechargePresenter.m +++ b/YuMi/Modules/YMMine/Presenter/XPMineRechargePresenter.m @@ -70,9 +70,12 @@ - (void)checkReceiptWithOrderId:(NSString *)orderId transcationId:(NSString *)transcationId errorToast:(BOOL)errorToast{ NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; + @kWeakify(self); [Api checkReceipt:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + @kStrongify(self); [[self getView] checkReceiptSuccess:transcationId]; }fail:^(NSInteger code, NSString * _Nullable msg) { + @kStrongify(self); [[self getView]checkReceiptFailWithCode:code transcationId:transcationId]; } showLoading:NO errorToast:errorToast] chooseEnv:@"true" chargeRecordId:orderId transcationId:transcationId uid:uid ticket:ticket]; } diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.m index cb36fb7c..79a732db 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoCustomNavView.m @@ -81,7 +81,7 @@ - (UIButton *)backButton { if (!_backButton) { _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] forState:UIControlStateNormal]; + [_backButton setImage:[[UIImage imageNamed:@"common_nav_back_white"]ms_SetImageForRTL] forState:UIControlStateNormal]; _backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; [_backButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m index efff7785..26765bae 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m @@ -54,6 +54,16 @@ return view;\ @property (nonatomic,strong) NSMutableArray *userPhotoArray; ///用户信息 @property (nonatomic,strong) UIView * userInfoView; +///头像的 +@property (nonatomic,strong) UserPhoto *avatarPhoto; +///头像 +@property (nonatomic,strong) NetImageView * avatarView; +@property (nonatomic,strong) NetImageView * avatarView_cp; +///普通的 +@property (nonatomic,strong) YYAnimatedImageView *headWearImageView; +///头饰播放 +@property (nonatomic, strong) SpriteSheetImageManager *manager; +@property (nonatomic, strong) SVGAImageView *headWearSvgaImageView; ///用户信息的背景 @@ -111,16 +121,7 @@ return view;\ @property (nonatomic,strong) UILabel *signatureLabel; ///分割线 //@property (nonatomic,strong) UIView * lineView; -///头像的 -@property (nonatomic,strong) UserPhoto *avatarPhoto; -///头像 -@property (nonatomic,strong) NetImageView * avatarView; -///普通的 -@property (nonatomic,strong) YYAnimatedImageView *headWearImageView; -///头饰播放 -@property (nonatomic, strong) SpriteSheetImageManager *manager; -@property (nonatomic, strong) SVGAImageView *headWearSvgaImageView; ///VIP等级icon @property (nonatomic,strong) NetImageView *nobleImageView; @@ -179,7 +180,22 @@ return view;\ [self addSubview:self.pi_cycleScrollView]; [self.pi_cycleScrollView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.trailing.top.mas_equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(256)); + make.height.mas_equalTo(kGetScaleWidth(195)); + }]; + + // 创建一个新的视图作为蒙层 + UIView *overlay = [[UIView alloc] initWithFrame:self.pi_cycleScrollView.bounds]; + + // 设置蒙层背景色为黑色，透明度为 0.5 + overlay.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5]; + + // 将蒙层添加到目标视图 + [self.pi_cycleScrollView addSubview:overlay]; + + // 确保蒙层大小适应目标视图的变化 + overlay.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; + [overlay mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.mas_equalTo(self.pi_cycleScrollView); }]; [self addSubview:self.onlineButton]; @@ -217,7 +233,7 @@ return view;\ [self addSubview:self.userInfoView]; [self.userInfoView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.trailing.mas_equalTo(self); - make.top.mas_equalTo(self).offset(kGetScaleWidth(224)); + make.top.mas_equalTo(self.pi_cycleScrollView.mas_bottom); make.bottom.mas_equalTo(self); }]; diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m index 5c7336e3..629910b0 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m @@ -1533,6 +1533,7 @@ if (!_vapView) { _vapView = [[VAPView alloc] init]; _vapView.contentMode = UIViewContentModeScaleAspectFill; + _vapView.userInteractionEnabled = NO; } return _vapView; }