diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 05cdc7a7..111f2752 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -12925,7 +12925,7 @@ CODE_SIGN_ENTITLEMENTS = YuMi/YuMi.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 48UCG35Q9W; ENABLE_BITCODE = NO; @@ -12956,7 +12956,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.32; + MARKETING_VERSION = 20.20.33; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -12979,7 +12979,7 @@ CODE_SIGN_ENTITLEMENTS = YuMi/YuMiRelease.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 48UCG35Q9W; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -12998,7 +12998,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.32; + MARKETING_VERSION = 20.20.33; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/YuMi/Global/YUMIMacroUitls.h b/YuMi/Global/YUMIMacroUitls.h index c1979aeb..f829504e 100644 --- a/YuMi/Global/YUMIMacroUitls.h +++ b/YuMi/Global/YUMIMacroUitls.h @@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns ///内置版本号 -#define PI_App_Version @"1.0.18" +#define PI_App_Version @"1.0.19" ///渠道 #define PI_App_Source @"appstore" #define PI_Test_Flight @"TestFlight" diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m index 6c0beb93..050818b7 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m @@ -206,22 +206,20 @@ -(NSInteger)getIndex{ for (int i = 0; i< self.tagsArray.count; i++) { GiftPanelTabModel *tab = [self.tagsArray xpSafeObjectAtIndex:i]; - if ([tab tabGiftType] == GiftType_Game && self.segmentType == GiftSegmentType_Normal) { + GiftType tabGiftType = [tab tabGiftType]; + if (tabGiftType == GiftType_Game && self.segmentType == GiftSegmentType_Normal) { return i; - } else if ([tab tabGiftType] == GiftType_Lucky && self.segmentType == GiftSegmentType_Lucky) { + } else if (tabGiftType == GiftType_Lucky && self.segmentType == GiftSegmentType_Lucky) { return i; - } else if ([tab tabGiftType] == GiftType_super && self.segmentType == GiftSegmentType_SuperLucky) { + } else if (tabGiftType == GiftType_super && self.segmentType == GiftSegmentType_SuperLucky) { return i; - } else if ([tab tabGiftType] == GiftType_WeekStar && self.segmentType == GiftSegmentType_WeekStar) { + } else if (tabGiftType == GiftType_WeekStar && self.segmentType == GiftSegmentType_WeekStar) { return i; - } else if ([tab tabGiftType] == GiftType_Noble && self.segmentType == GiftSegmentType_Noble) { + } else if (tabGiftType == GiftType_Noble && self.segmentType == GiftSegmentType_Noble) { return i; - } else if ([tab tabGiftType] == GiftType_Country && self.segmentType == GiftSegmentType_Country) { + } else if (tabGiftType == GiftType_Country && self.segmentType == GiftSegmentType_Country) { return i; - } else if ([tab tabGiftType] == GiftSegmentType_Anchor && self.segmentType == GiftSegmentType_Anchor) { - return i; - } - else if ([tab tabGiftType] == GiftSegmentType_Anchor && self.segmentType == GiftSegmentType_Anchor) { + } else if (tabGiftType == GiftType_Anchor && self.segmentType == GiftSegmentType_Anchor) { return i; } } diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m index 691716c8..622c23eb 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m @@ -422,7 +422,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView; ///礼物来源 GiftSourceType sourceType = giftInfo.sourceType; if(sourceType != GiftSourceType_Normal && sourceType != GiftSourceType_Pack){ - sourceType = _segmentType == GiftSegmentType_Pack ? GiftSourceType_Pack :GiftSourceType_Normal; + sourceType = _segmentType == GiftSegmentType_Pack ? GiftSourceType_Pack : GiftSourceType_Normal; } ///送一个人 还是全麦 还是多人非全麦 RoomSendGiftType roomSendType = [self dealRoomSendGiftType:giftInfo giftCount:giftCount]; @@ -434,7 +434,6 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView; [self.presenter sendGift:uidString giftNum:giftNumber sendType:sendType giftId:giftId giftSource:sourceType giftType:giftInfo.giftType roomSendType:roomSendType roomUid:self.roomUid msg:@""]; } else { [self showErrorToast:YMLocalizedString(@"XPSendGiftView2")]; - return; } } else if(self.usingplaceType == SendGiftType_User) { ///送礼物的人 @@ -455,7 +454,6 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView; self.giftBarView.sendButtonIsEnable = NO; [self.presenter sendGift:uidString giftNum:giftNumber sendType:sendType giftId:giftId giftSource:sourceType giftType:giftInfo.giftType roomSendType:roomSendType roomUid:self.roomUid msg:@""]; } - } ///充值