diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m index 5f61bfe6..4c0379de 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordGoldDetailsPickViewView.m @@ -379,6 +379,9 @@ - (UIPickerView *)pickerView{ if (!_pickerView){ _pickerView = [[UIPickerView alloc]initWithFrame:CGRectZero]; + if (@available(iOS 13.0, *)) { + _pickerView.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; + } _pickerView.delegate = self; _pickerView.dataSource = self; } diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m index 071feaab..ea2323c7 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m @@ -329,6 +329,9 @@ - (UIPickerView *)pickerView{ if (!_pickerView){ _pickerView = [[UIPickerView alloc]initWithFrame:CGRectZero]; + if (@available(iOS 13.0, *)) { + _pickerView.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; + } _pickerView.delegate = self; _pickerView.dataSource = self; } diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m index 7b5397ce..3af61d72 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m @@ -136,6 +136,9 @@ - (UIPickerView *)pickerView{ if (!_pickerView){ _pickerView = [[UIPickerView alloc]initWithFrame:CGRectZero]; + if (@available(iOS 13.0, *)) { + _pickerView.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; + } _pickerView.delegate = self; _pickerView.dataSource = self; } diff --git a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m b/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m index 8572e842..86ee444f 100644 --- a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m +++ b/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m @@ -8,7 +8,6 @@ #import "XPMonentsPublishViewController.h" ///Third #import -#import #import ///Tool #import "YUMIMacroUitls.h" diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrpssRoomPKPanelView.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrpssRoomPKPanelView.m index f6620f33..c84f5016 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrpssRoomPKPanelView.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrpssRoomPKPanelView.m @@ -235,13 +235,13 @@ make.bottom.mas_equalTo(self.stackView).offset(17); }]; [self.helpButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(145); + make.left.mas_equalTo(145); make.top.mas_equalTo(8); make.width.height.mas_equalTo(16); }]; [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.helpButton); - make.centerX.mas_equalTo(self.helpButton.mas_trailing).offset(66); + make.centerX.mas_equalTo(self.helpButton.mas_right).offset(66); }]; [self.ruleBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m index 4decb571..0cbaad88 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m @@ -2069,9 +2069,12 @@ self.giftEffectView.clearsAfterStop = YES; self.giftEffectView.videoItem = videoItem; [self.giftEffectView startAnimation]; + return; } + self.isLargeGiftAnimating = NO; } failureBlock:^(NSError * _Nonnull error) { self.giftEffectView.hidden = YES; + self.isLargeGiftAnimating = NO; }]; return; @@ -2106,9 +2109,12 @@ self.giftEffectView.clearsAfterStop = YES; self.giftEffectView.videoItem = videoItem; [self.giftEffectView startAnimation]; + return; } + self.isLargeGiftAnimating = NO; } failureBlock:^(NSError * _Nullable error) { self.giftEffectView.hidden = YES; + self.isLargeGiftAnimating = NO; }]; } ///播放礼物特效 pag的 @@ -2437,6 +2443,11 @@ } }); } +- (void)viewDidFailPlayMP4:(NSError *)error{ + if (self.isLargeGiftAnimating == YES) { + self.isLargeGiftAnimating = NO; + } +} #pragma mark - PAGViewListener /** * Notifies the beginning of the animation. It can be called from either the UI thread or the thread diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m index 45d6ef15..2a8881f6 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/SubViews/XPRoomPKTimePickerView.m @@ -209,6 +209,9 @@ if (!_pickView) { _pickView = [[UIPickerView alloc] init]; _pickView.backgroundColor = [UIColor whiteColor]; + if (@available(iOS 13.0, *)) { + _pickView.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; + } _pickView.delegate = self; _pickView.dataSource = self; } diff --git a/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m b/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m index 422203f7..20567d9e 100644 --- a/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m +++ b/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m @@ -7,7 +7,6 @@ #import "XPUpgradeView.h" #import -#import #import "UIImage+Utils.h" #import "YUMIMacroUitls.h" #import "DJDKMIMOMColor.h" diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 0b703fb0..cac54e84 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -2027,7 +2027,26 @@ ineHeadView12" = "الحمل"; "XPRoomMessageParser48" = "رسالة"; "XPRoomMessageParser49" = "فتح المسؤول تأثيرات الهدايا في الغرفة"; "XPRoomMessageParser50" = "أغلق المسؤول تأثيرات الهدايا في الغرفة، انقر على الرمز"; - +"XPRoomMessageParser51" = "يمكن فتح الرمز لفتح"; +"XPRoomMessageParser52" = "رسالة"; +"XPRoomMessageParser53" = "المضيف"; +"XPRoomMessageParser54" = "المسؤول"; +"XPRoomMessageParser55" = "تم مسح رسائل الغرفة العامة"; +"XPRoomMessageParser57" = "أنثى"; +"XPRoomMessageParser58" = "%d %@ الضيف:"; +"XPRoomMessageParser59" = "اخترت في هذا الدور"; +"XPRoomMessageParser60" = "كشريك محبوب"; +"XPRoomMessageParser61" = "تهانينا"; +"XPRoomMessageParser62" = "و"; +"XPRoomMessageParser63" = "نجحت في الإمساك بأيدي بعضهم البعض، لنكن شهودًا على بداية سعيدهم"; +"XPRoomMessageParser64" = "كشريك محبوب"; +"XPRoomMessageParser65" = "لم يتم اختيار شريك محبوب"; +"XPRoomMessageParser66" = "المسؤول"; +"XPRoomMessageParser67" = "فتح"; +"XPRoomMessageParser68" = "وضع الانتظار"; +"XPRoomMessageParser69" = "أغلق"; +"XPRoomMessageParser70" = "وضع الانتظار"; +"XPRoomMessageParser71" = "الإعدادات"; "XPRoomMessageParser72" = "%d موضع الميكروفون"; "XPRoomMessageParser73" = "لميكروفون الحرية"; "XPRoomMessageParser74" = "تم إغلاق"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index 64a2c279..32a57385 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -1788,7 +1788,7 @@ "XPRoomMessageParser75" = "Mic %d"; "XPRoomMessageParser76" = "as Free Mic"; "XPRoomMessageParser77" = "Awesome "; -"XPRoomMessageParser78" = "obtained through Love Journey"; +"XPRoomMessageParser78" = " obtained through Love Journey"; "XPRoomMessageParser79" = "(Visible only to yourself)"; "XPRoomMessageParser80" = "VIP has arrived! Congratulations"; "XPRoomMessageParser81" = "on opening the VIPe system, obtaining"; @@ -2345,7 +2345,7 @@ "XPLoginRegisterViewController2" = "Verification code sent successfully"; "XPLoginRegisterViewController3" = "Phone Number Registration"; "XPLoginRegisterViewController4" = "Please enter phone number"; -"XPLoginRegisterViewController5" = "Please enter verification code"; + "XPLoginRegisterViewController6" = "Please enter password"; "XPLoginRegisterViewController7" = "Get Verification Code"; @@ -2376,7 +2376,7 @@ "XPModifyPhoneViewController0" = "The verification code has been sent to the new phone number. Please enter the verification code to complete the modification"; "XPModifyPhoneViewController1" = "Please enter phone number"; -"XPModifyPhoneViewController2" = "Please enter verification code"; + "XPModifyPhoneViewController3" = "Please enter valid phone number"; "XPModifyPhoneViewController4" = "Verification code sent successfully"; @@ -2389,7 +2389,7 @@ "XPBindPhoneViewController0" = "Phone Binding"; "XPBindPhoneViewController1" = "The verification code has been sent to the new phone number. Please enter the verification code to complete the binding"; "XPBindPhoneViewController2" = "Please enter phone number"; -"XPBindPhoneViewController3" = "Please enter verification code"; + "XPBindPhoneViewController4" = "Please enter valid phone number"; "XPBindPhoneViewController5" = "Verification code sent successfully"; @@ -3086,7 +3086,7 @@ "LoginForgetPasswordViewController5" = "Please enter a correct phone number"; "LoginForgetPasswordViewController6" = "Submit"; "LoginForgetPasswordViewController7" = "Please enter phone number"; -"LoginForgetPasswordViewController8" = "Please enter verification code"; +"LoginForgetPasswordViewController8" = "verification code"; "LoginForgetPasswordViewController9" = "Please enter password (6-16 characters)"; "XPGiftLuckyGiftBroadcastCell6"="Weekly Star List";