Merge pull request #1321 from shuLeesin/master

iCloud同步失败的提示

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/ar.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "معالجة...";
 "No Photos or Videos"     = "لا توجد صور أو مقاطع فيديو";
 "Synchronizing photos from iCloud" = "مزامنة الصور من iCloud";
+"iCloud sync failed"    = "iCloud فشلت المزامنة";
 "Can not use camera"      = "لا يمكن استخدام الكاميرا";
 "Can not choose both video and photo" = "لا يمكن اختيار كل من الفيديو والصور";
 "Can not choose both photo and GIF" = "لا يمكن اختيار كل من الصور و GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/bg.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Обработка ...";
 "No Photos or Videos"     = "Няма снимки или видеоклипове";
 "Synchronizing photos from iCloud" = "Синхронизиране на снимки от iCloud";
+"iCloud sync failed"    = "iCloud синхронизирането не бе успешно";
 "Can not use camera"      = "Не може да се използва камера";
 "Can not choose both video and photo" = "Не можете да изберете видео и снимка";
 "Can not choose both photo and GIF" = "Не може да се избере снимка и GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/cs-CZ.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Zpracovává se...";
 "No Photos or Videos"     = "Žádné fotky nebo videa";
 "Synchronizing photos from iCloud" = "Synchronizace fotografií z iCloud";
+"iCloud sync failed"    = "iCloud synchronizace selhala";
 "Can not use camera"      = "Nelze použít fotoaparát";
 "Can not choose both video and photo" = "Nelze vybrat video ani fotografii";
 "Can not choose both photo and GIF" = "Nelze vybrat fotografie a GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/de.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Wird bearbeitet...";
 "No Photos or Videos"     = "Keine Fotos oder Videos";
 "Synchronizing photos from iCloud" = "Fotos aus iCloud synchronisieren";
+"iCloud sync failed"    = "iCloud Synchronisierung fehlgeschlagen";
 "Can not use camera"      = "Kann die Kamera nicht benutzen";
 "Can not choose both video and photo" = "Video und Foto können nicht ausgewählt werden";
 "Can not choose both photo and GIF" = "Foto und GIF können nicht ausgewählt werden";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/el.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Επεξεργασία...";
 "No Photos or Videos"     = "Δεν υπάρχουν φωτογραφίες ή βίντεο";
 "Synchronizing photos from iCloud" = "Συγχρονισμός φωτογραφιών από το iCloud";
+"iCloud sync failed"    = "iCloud Ο συγχρονισμός απέτυχε";
 "Can not use camera"      = "Δεν είναι δυνατή η χρήση της κάμερας";
 "Can not choose both video and photo" = "Δεν είναι δυνατή η επιλογή του βίντεο και της φωτογραφίας";
 "Can not choose both photo and GIF" = "Δεν είναι δυνατή η επιλογή φωτογραφίας και GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/en.lproj/Localizable.strings

 "KEY"                     = "英语";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/es.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Tratamiento...";
 "No Photos or Videos"     = "No hay fotos o videos";
 "Synchronizing photos from iCloud" = "Sincronizando fotos desde iCloud";
+"iCloud sync failed"    = "la sincronización falló";
 "Can not use camera"      = "No puedo usar la camara";
 "Can not choose both video and photo" = "No se puede elegir tanto el video como la foto.";
 "Can not choose both photo and GIF" = "No se puede elegir tanto foto como GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/fr.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "En traitement...";
 "No Photos or Videos"     = "Aucune photo ou vidéo";
 "Synchronizing photos from iCloud" = "Synchroniser des photos depuis iCloud";
+"iCloud sync failed"    = "iCloud échec de la synchronisation";
 "Can not use camera"      = "Impossible d'utiliser la caméra";
 "Can not choose both video and photo" = "Impossible de choisir à la fois la vidéo et la photo";
 "Can not choose both photo and GIF" = "Impossible de choisir à la fois photo et GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/he.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "מעבד...";
 "No Photos or Videos"     = "אין תמונות או סרטונים";
 "Synchronizing photos from iCloud" = "סנכרון תמונות מ - iCloud";
+"iCloud sync failed"    = "iCloud הסנכרון נכשל";
 "Can not use camera"      = "לא ניתן להשתמש במצלמה";
 "Can not choose both video and photo" = "לא ניתן לבחור הן בסרטון והן בתמונה";
 "Can not choose both photo and GIF" = "לא ניתן לבחור גם תמונה וגם קובץ GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/it.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "In lavorazione...";
 "No Photos or Videos"     = "Nessuna foto o video";
 "Synchronizing photos from iCloud" = "Sincronizzazione delle foto da iCloud";
+"iCloud sync failed"    = "iCloud sincronizzazione non riuscita";
 "Can not use camera"      = "Non è possibile utilizzare la fotocamera";
 "Can not choose both video and photo" = "Non è possibile scegliere sia video che foto";
 "Can not choose both photo and GIF" = "Non è possibile scegliere sia foto che GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/ja.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "処理...";
 "No Photos or Videos"     = "写真やビデオはありません";
 "Synchronizing photos from iCloud" = "iCloudから写真を同期する";
+"iCloud sync failed"    = "iCloud同期に失敗しました";
 "Can not use camera"      = "カメラが使えない";
 "Can not choose both video and photo" = "ビデオと写真の両方を選択することはできません";
 "Can not choose both photo and GIF" = "写真とGIFの両方を選択することはできません";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/ko-KP.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "처리...";
 "No Photos or Videos"     = "아무 사진이 나 동영상";
 "Synchronizing photos from iCloud" = "ICloud에서 사진을 동기화";
+"iCloud sync failed"    = "iCloud동기화 실패";
 "Can not use camera"      = "카메라를 사용할 수 없습니다.";
 "Can not choose both video and photo" = "비디오와 사진 둘 다를 선택할 수 없습니다.";
 "Can not choose both photo and GIF" = "사진 및 GIF를 선택할 수 없습니다.";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/ko.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "처리 중 ...";
 "No Photos or Videos"     = "사진이나 동영상 없음";
 "Synchronizing photos from iCloud" = "iCloud에서 사진 동기화";
+"iCloud sync failed"    = "iCloud동기화 실패";
 "Can not use camera"      = "카메라를 사용할 수 없습니다.";
 "Can not choose both video and photo" = "동영상과 사진을 모두 선택할 수 없습니다.";
 "Can not choose both photo and GIF" = "사진과 GIF를 모두 선택할 수 없습니다.";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/nl.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Verwerken...";
 "No Photos or Videos"     = "Geen foto's of video's";
 "Synchronizing photos from iCloud" = "Foto's synchroniseren vanuit iCloud";
+"iCloud sync failed"    = "iCloud synchronisatie is mislukt";
 "Can not use camera"      = "Kan de camera niet gebruiken";
 "Can not choose both video and photo" = "Kan niet zowel video als foto kiezen";
 "Can not choose both photo and GIF" = "Kan niet zowel foto als GIF kiezen";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/pl.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Przetwarzanie...";
 "No Photos or Videos"     = "Brak zdjęć lub filmów";
 "Synchronizing photos from iCloud" = "Synchronizowanie zdjęć z iCloud";
+"iCloud sync failed"    = "iCloud synchronizacja nie powiodła się";
 "Can not use camera"      = "Nie można używać aparatu";
 "Can not choose both video and photo" = "Nie można wybrać zarówno wideo,jak i zdjęcia";
 "Can not choose both photo and GIF" = "Nie można wybrać zarówno zdjęcia,jak i GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/pt.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Em processamento...";
 "No Photos or Videos"     = "Sem fotos ou vídeos";
 "Synchronizing photos from iCloud" = "Sincronizando fotos do iCloud";
+"iCloud sync failed"    = "iCloud falha na sincronização";
 "Can not use camera"      = "Não pode usar a câmera";
 "Can not choose both video and photo" = "Não é possível escolher vídeo e foto";
 "Can not choose both photo and GIF" = "Não é possível escolher foto e GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/ro.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Prelucrare...";
 "No Photos or Videos"     = "Nu există fotografii sau videoclipuri";
 "Synchronizing photos from iCloud" = "Sincronizarea fotografiilor cu iCloud";
+"iCloud sync failed"    = "iCloud sincronizarea a eșuat";
 "Can not use camera"      = "Nu pot folosi camera";
 "Can not choose both video and photo" = "Nu puteți alege atât videoclipul,cât și fotografia";
 "Can not choose both photo and GIF" = "Nu puteți alege atât fotografia,cât și GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/ru.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Обработка ...";
 "No Photos or Videos"     = "Нет фото или видео";
 "Synchronizing photos from iCloud" = "Синхронизация фотографий из iCloud";
+"iCloud sync failed"    = "iCloud сбой синхронизации";
 "Can not use camera"      = "Не могу использовать камеру";
 "Can not choose both video and photo" = "Не могу выбрать как видео,так и фото";
 "Can not choose both photo and GIF" = "Не могу выбрать фото и GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/sk.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Spracovanie ...";
 "No Photos or Videos"     = "Žiadne fotografie alebo videá";
 "Synchronizing photos from iCloud" = "Synchronizácia fotografií z iCloud";
+"iCloud sync failed"    = "iCloud synchronizácia zlyhala";
 "Can not use camera"      = "Fotoaparát nie je možné používať";
 "Can not choose both video and photo" = "Nie je možné vybrať video aj fotografiu";
 "Can not choose both photo and GIF" = "Nie je možné vybrať fotografie a obrázky GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/sv.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Bearbetning ...";
 "No Photos or Videos"     = "Inga foton eller videor";
 "Synchronizing photos from iCloud" = "Synkronisera foton från iCloud";
+"iCloud sync failed"    = "iCloud synkroniseringen misslyckades";
 "Can not use camera"      = "Kan inte använda kamera";
 "Can not choose both video and photo" = "Kan inte välja både video och foto";
 "Can not choose both photo and GIF" = "Kan inte välja både foto och GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/th.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "กำลังประมวลผล ...";
 "No Photos or Videos"     = "ไม่มีรูปภาพหรือวิดีโอ";
 "Synchronizing photos from iCloud" = "การซิงโครไนซ์ภาพถ่ายจาก iCloud";
+"iCloud sync failed"    = "iCloud การซิงค์ล้มเหลว";
 "Can not use camera"      = "ไม่สามารถใช้กล้องถ่ายรูป";
 "Can not choose both video and photo" = "ไม่สามารถเลือกได้ทั้งวิดีโอและภาพถ่าย";
 "Can not choose both photo and GIF" = "ไม่สามารถเลือกได้ทั้งภาพถ่ายและ GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/tr.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "İşleme...";
 "No Photos or Videos"     = "Fotoğraf veya Video Yok";
 "Synchronizing photos from iCloud" = "Fotoğrafları iCloud'dan senkronize etme";
+"iCloud sync failed"    = "iCloud senkronizasyon başarısız oldu";
 "Can not use camera"      = "Kamera kullanılamaz";
 "Can not choose both video and photo" = "Hem video hem de fotoğraf seçilemiyor";
 "Can not choose both photo and GIF" = "Hem fotoğraf hem de GIF seçilemiyor";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/uk.lproj/Localizable.strings

@@ -12,6 +12,7 @@
 "Processing..."           = "Обробка ...";
 "No Photos or Videos"     = "Немає фотографій або відео";
 "Synchronizing photos from iCloud" = "Синхронізація фотографій з iCloud";
+"iCloud sync failed"    = "iCloud помилка синхронізації";
 "Can not use camera"      = "Не можна використовувати камеру";
 "Can not choose both video and photo" = "Неможливо вибрати як відео,так і фото";
 "Can not choose both photo and GIF" = "Неможливо вибрати як фото,так і GIF";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/vi.lproj/Localizable.strings

@@ -13,6 +13,7 @@
 "No Photos or Videos"     = "Không có ảnh hoặc video";
 "Can not use camera" = "Máy chụp hình không khả dụng";
 "Synchronizing photos from iCloud" = "Đang đồng bộ hình ảnh từ ICloud";
+"iCloud sync failed"    = "iCloud đồng bộ hóa không thành công";
 "Can not choose both video and photo" = "Trong lúc chọn hình ảnh không cùng lúc chọn video";
 "Can not choose both photo and GIF" = "Trong lúc chọn hình ảnh không cùng lúc chọn hình GIF";
 "Select the video when in multi state, we will handle the video as a photo" = "Chọn hình ảnh cùng video, video sẽ bị mặc nhận thành hình ảnh và gửi đi.";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/zh-Hans.lproj/Localizable.strings

 "KEY"                     = "简体中文";

TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/zh-Hant.lproj/Localizable.strings

 "KEY"                     = "繁体中文";

TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.h

@@ -38,6 +38,7 @@
 @property (nonatomic, strong) UIScrollView *scrollView;
 @property (nonatomic, strong) UIView *imageContainerView;
 @property (nonatomic, strong) TZProgressView *progressView;
+@property (nonatomic, strong) UIView *iCloudErrorView; // iCloud加载失败提示View
 
 @property (nonatomic, assign) BOOL allowCrop;
 @property (nonatomic, assign) CGRect cropRect;

TZImagePickerController/TZImagePickerController/TZPhotoPreviewCell.m

@@ -134,6 +134,20 @@
         _imageView.clipsToBounds = YES;
         [_imageContainerView addSubview:_imageView];
         
+        _iCloudErrorView = [[UIView alloc] initWithFrame:CGRectMake(0, [TZCommonTools tz_isIPhoneX] ? 88 : 64, self.tz_width, 28)];
+        UIImageView *icloud = [[UIImageView alloc] init];
+        icloud.image = [UIImage tz_imageNamedFromMyBundle:@"iCloudError"];
+        icloud.frame = CGRectMake(10, 0, 28, 28);
+        [_iCloudErrorView addSubview:icloud];
+        UILabel *label = [[UILabel alloc] init];
+        label.frame = CGRectMake(40, 0, self.tz_width - 50, 28);
+        label.font = [UIFont systemFontOfSize:10];
+        label.textColor = [UIColor whiteColor];
+        label.text = [NSBundle tz_localizedStringForKey:@"iCloud sync failed"];
+        [_iCloudErrorView addSubview:label];
+        [self addSubview:_iCloudErrorView];
+        _iCloudErrorView.hidden = YES;
+        
         UITapGestureRecognizer *tap1 = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTap:)];
         [self addGestureRecognizer:tap1];
         UITapGestureRecognizer *tap2 = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(doubleTap:)];
@@ -159,6 +173,11 @@
     if (model.type == TZAssetModelMediaTypePhotoGif) {
         // 先显示缩略图
         [[TZImageManager manager] getPhotoWithAsset:model.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
+            if (!photo && [info[PHImageResultIsInCloudKey] boolValue]) {
+                self.iCloudErrorView.hidden = NO;
+            } else {
+                self.iCloudErrorView.hidden = YES;
+            }
             self.imageView.image = photo;
             [self resizeSubviews];
             if (self.isRequestingGIF) {
@@ -205,6 +224,11 @@
     _asset = asset;
     self.imageRequestID = [[TZImageManager manager] getPhotoWithAsset:asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
         if (![asset isEqual:self->_asset]) return;
+        if (!photo && [info[PHImageResultIsInCloudKey] boolValue]) {
+            self.iCloudErrorView.hidden = NO;
+        } else {
+            self.iCloudErrorView.hidden = YES;
+        }
         self.imageView.image = photo;
         [self resizeSubviews];
         if (self.imageView.tz_height && self.allowCrop) {

TZImagePickerController/TZImagePickerController/TZVideoPlayerController.m

@@ -27,6 +27,8 @@
     UIStatusBarStyle _originStatusBarStyle;
 }
 @property (assign, nonatomic) BOOL needShowStatusBar;
+// iCloud无法同步提示UI
+@property (nonatomic, strong) UIView *iCloudErrorView;
 @end
 
 #pragma clang diagnostic push
@@ -62,9 +64,13 @@
 
 - (void)configMoviePlayer {
     [[TZImageManager manager] getPhotoWithAsset:_model.asset completion:^(UIImage *photo, NSDictionary *info, BOOL isDegraded) {
+        if (!photo && [info[PHImageResultIsInCloudKey] boolValue]) {
+            self.iCloudErrorView.hidden = NO;
+        }
         if (!isDegraded && photo) {
             self->_cover = photo;
             self->_doneButton.enabled = YES;
+            self.iCloudErrorView.hidden = YES;
         }
     }];
     [[TZImageManager manager] getVideoWithAsset:_model.asset completion:^(AVPlayerItem *playerItem, NSDictionary *info) {
@@ -215,6 +221,26 @@
     }
 }
 
+#pragma mark - lazy
+- (UIView *)iCloudErrorView{
+    if (!_iCloudErrorView) {
+        _iCloudErrorView = [[UIView alloc] initWithFrame:CGRectMake(0, [TZCommonTools tz_isIPhoneX] ? 88 : 64, self.view.tz_width, 28)];
+        UIImageView *icloud = [[UIImageView alloc] init];
+        icloud.image = [UIImage tz_imageNamedFromMyBundle:@"iCloudError"];
+        icloud.frame = CGRectMake(10, 0, 28, 28);
+        [_iCloudErrorView addSubview:icloud];
+        UILabel *label = [[UILabel alloc] init];
+        label.frame = CGRectMake(40, 0, self.view.tz_width - 50, 28);
+        label.font = [UIFont systemFontOfSize:10];
+        label.textColor = [UIColor whiteColor];
+        label.text = [NSBundle tz_localizedStringForKey:@"iCloud sync failed"];
+        [_iCloudErrorView addSubview:label];
+        [self.view addSubview:_iCloudErrorView];
+        _iCloudErrorView.hidden = YES;
+    }
+    return _iCloudErrorView;
+}
+
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }