diff --git a/QXLive.xcodeproj/project.pbxproj b/QXLive.xcodeproj/project.pbxproj index 3ba176a..fc8f1c5 100644 --- a/QXLive.xcodeproj/project.pbxproj +++ b/QXLive.xcodeproj/project.pbxproj @@ -785,7 +785,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.6; PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -847,7 +847,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.5; + MARKETING_VERSION = 1.0.6; PRODUCT_BUNDLE_IDENTIFIER = com.xscm.midi; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreen.xcscheme b/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreen.xcscheme index 35da550..8819567 100644 --- a/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreen.xcscheme +++ b/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreen.xcscheme @@ -87,7 +87,6 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES" - askForAppToLaunch = "Yes" launchAutomaticallySubstyle = "2"> diff --git a/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreenDev.xcscheme b/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreenDev.xcscheme index e61af29..9bd1f8a 100644 --- a/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreenDev.xcscheme +++ b/QXLive.xcodeproj/xcshareddata/xcschemes/QXLiveScreenDev.xcscheme @@ -49,7 +49,6 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES" - askForAppToLaunch = "Yes" launchAutomaticallySubstyle = "2"> 0 && model.messageType == QXRoomChatMessageTypeSystem) { + if (self.delegate && [self.delegate respondsToSelector:@selector(previewUserInfoWithUserId:)]) { + [self.delegate previewUserInfoWithUserId:model.FromUserInfo.user_id]; + } + } +} -(void)scrollViewDidScroll:(UIScrollView *)scrollView{ CGFloat height = scrollView.frame.size.height; diff --git a/QXLive/活动/天空之境/QXSkyPraizeView.h b/QXLive/活动/天空之境/QXSkyPraizeView.h index 5c74090..fac1972 100644 --- a/QXLive/活动/天空之境/QXSkyPraizeView.h +++ b/QXLive/活动/天空之境/QXSkyPraizeView.h @@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,strong)QXGiftActivityModel *model; @property (nonatomic,strong)NSString* userIds; @property (nonatomic,strong)NSString* heartId; +@property (nonatomic,strong)NSString* auctionId; @property (nonatomic,copy)void(^startBlock)(void); -(void)showInView:(UIView *)view; -(void)hide; diff --git a/QXLive/活动/岁月之城/QXAgePraizeView.h b/QXLive/活动/岁月之城/QXAgePraizeView.h index 1fddad7..06984d3 100644 --- a/QXLive/活动/岁月之城/QXAgePraizeView.h +++ b/QXLive/活动/岁月之城/QXAgePraizeView.h @@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,strong)QXGiftActivityModel *model; @property (nonatomic,strong)NSString* userIds; @property (nonatomic,strong)NSString* heartId; +@property (nonatomic,strong)NSString* auctionId; @property (nonatomic,copy)void(^startBlock)(void); -(void)showInView:(UIView *)view; -(void)hide; diff --git a/QXLive/活动/巡乐会/QXMeetActivityView.m b/QXLive/活动/巡乐会/QXMeetActivityView.m index 3d25b5e..d6c5708 100644 --- a/QXLive/活动/巡乐会/QXMeetActivityView.m +++ b/QXLive/活动/巡乐会/QXMeetActivityView.m @@ -191,11 +191,11 @@ self.roomLuckUserView.centerX = self.roomOwenrView.centerX; [self.bgView addSubview:self.roomLuckUserView]; - self.bottomGiftBgView = [[UIView alloc] initWithFrame:CGRectMake(self.topGiftView.left-20, self.roomLuckUserView.bottom-14-ScaleWidth(118), ScaleWidth(118), 14+ScaleWidth(118))]; + self.bottomGiftBgView = [[UIView alloc] initWithFrame:CGRectMake(self.topGiftView.left-20, self.roomLuckUserView.bottom-14-ScaleWidth(118)-15, ScaleWidth(118), 14+ScaleWidth(118))]; self.bottomGiftBgView.bottom = self.roomLuckUserView.bottom; [self.bgView addSubview:self.bottomGiftBgView]; - self.bottomGiftView = [[QXMeetGiftView alloc] initWithFrame:CGRectMake(0, 10, ScaleWidth(118), ScaleWidth(118)+14)]; + self.bottomGiftView = [[QXMeetGiftView alloc] initWithFrame:CGRectMake(0, 0, ScaleWidth(118), ScaleWidth(118)+14)]; self.bottomGiftView.isLockGift = YES; [self.bottomGiftBgView addSubview:self.bottomGiftView]; diff --git a/QXLive/活动/时空之巅/QXTimePraizeView.h b/QXLive/活动/时空之巅/QXTimePraizeView.h index 5487817..e61b70f 100644 --- a/QXLive/活动/时空之巅/QXTimePraizeView.h +++ b/QXLive/活动/时空之巅/QXTimePraizeView.h @@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,strong)QXGiftActivityModel *model; @property (nonatomic,strong)NSString* userIds; @property (nonatomic,strong)NSString* heartId; +@property (nonatomic,strong)NSString* auctionId; @property (nonatomic,copy)void(^startBlock)(void); -(void)showInView:(UIView *)view; -(void)hide;