From 4878af27bbeb9386e81e207b9b87fc91d160dda9 Mon Sep 17 00:00:00 2001 From: "lixiang.yang" Date: Mon, 24 Aug 2020 14:13:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=99=E9=87=8C=EF=BC=8C?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E6=98=AF=EF=BC=9A=E6=9C=89=E6=BD=9C=E5=9C=A8?= =?UTF-8?q?Crash=E7=9A=84=E9=A3=8E=E9=99=A9=E3=80=82=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E6=9D=A5=E8=AF=B4=EF=BC=8C=E5=AF=B9=E4=BA=8E=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=BA=94=E7=94=A8=EF=BC=8C=E4=B8=BA=E4=BA=86=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E5=8C=85=E4=BD=93=E7=A7=AF=EF=BC=8C=E4=B8=80=E8=88=AC=E5=8F=AA?= =?UTF-8?q?=E4=BC=9A=E7=95=99=E8=8B=B1=E6=96=87=E5=92=8C=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E5=81=87=E8=AE=BE=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=81=8F=E5=A5=BD=E8=AF=AD=E8=A8=80=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E5=85=B6=E4=BB=96=E8=AF=AD=E8=A8=80=EF=BC=8C?= =?UTF-8?q?=E5=B0=B1=E4=BC=9ACrash=EF=BC=8C=E5=8F=A6=E5=A4=96=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=E4=BA=86=E4=B8=A4=E7=A7=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E7=9B=B8=E5=BA=94=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=88=96=E8=80=85=E4=BD=BF=E7=94=A8=E5=88=A4=E7=A9=BA?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TZImagePickerController.m | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/TZImagePickerController/TZImagePickerController/TZImagePickerController.m b/TZImagePickerController/TZImagePickerController/TZImagePickerController.m index bee3108f..fddf1e4d 100644 --- a/TZImagePickerController/TZImagePickerController/TZImagePickerController.m +++ b/TZImagePickerController/TZImagePickerController/TZImagePickerController.m @@ -950,7 +950,7 @@ + (instancetype)sharedInstance { dispatch_once(&onceToken, ^{ if (config == nil) { config = [[TZImagePickerConfig alloc] init]; - config.preferredLanguage = nil; + config.preferredLanguage = [NSLocale preferredLanguages].firstObject; config.gifPreviewMaxImagesCount = 50; } }); @@ -960,9 +960,7 @@ + (instancetype)sharedInstance { - (void)setPreferredLanguage:(NSString *)preferredLanguage { _preferredLanguage = preferredLanguage; - if (!preferredLanguage || !preferredLanguage.length) { - preferredLanguage = [NSLocale preferredLanguages].firstObject; - } +#warning 如果你的应用移除了zh-Hant、vi的语言包，移除相应的逻辑 或者 使用下面👇的判断逻辑，以防止Crash if ([preferredLanguage rangeOfString:@"zh-Hans"].location != NSNotFound) { preferredLanguage = @"zh-Hans"; } else if ([preferredLanguage rangeOfString:@"zh-Hant"].location != NSNotFound) { @@ -972,6 +970,13 @@ - (void)setPreferredLanguage:(NSString *)preferredLanguage { } else { preferredLanguage = @"en"; } + /* 判空逻辑 + NSString *languagePath = [[NSBundle tz_imagePickerBundle] pathForResource:preferredLanguage ofType:@"lproj"]; + NSAssert(languagePath, @"请检查是否缺少了相应的语言文件"); + if (!languagePath) { + preferredLanguage = @"en"; + } + */ _languageBundle = [NSBundle bundleWithPath:[[NSBundle tz_imagePickerBundle] pathForResource:preferredLanguage ofType:@"lproj"]]; }