Skip to content

GitLab

D
dz_TZImagePickerController
Commit de0f0752 authored by 翟书觅's avatar 翟书觅
Browse files
Options

iCloud同步失败的提示

parent 6189bd1c
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 7 deletions
TZImagePickerController.xcodeproj/project.pbxproj
View file @ de0f0752
......@@ -487,7 +487,7 @@
TargetAttributes = {
900E657B1C2BB8D5003D9A9E = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = LTFQDC2QVX;
DevelopmentTeam = JYK5L225PH;
ProvisioningStyle = Automatic;
};
900E65941C2BB8D5003D9A9E = {
......@@ -796,10 +796,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = LTFQDC2QVX;
DEVELOPMENT_TEAM = JYK5L225PH;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/TZImagePickerController",
......@@ -808,7 +808,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 3.3.2;
PRODUCT_BUNDLE_IDENTIFIER = tanzhenios2019.TZImagePickerController.www;
PRODUCT_BUNDLE_IDENTIFIER = zsmios2020.TZImagePickerController.www;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -820,10 +820,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = LTFQDC2QVX;
DEVELOPMENT_TEAM = JYK5L225PH;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/TZImagePickerController",
......@@ -832,7 +832,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 3.3.2;
PRODUCT_BUNDLE_IDENTIFIER = tanzhenios2019.TZImagePickerController.www;
PRODUCT_BUNDLE_IDENTIFIER = zsmios2020.TZImagePickerController.www;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
......
TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/ar.lproj/Localizable.strings
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "معالجة...";
"No Photos or Videos" = "لا توجد صور أو مقاطع فيديو";
"Synchronizing photos from iCloud" = "مزامنة الصور من iCloud";
"iCloud Loading Error" = "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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "Обработка ...";
"No Photos or Videos" = "Няма снимки или видеоклипове";
"Synchronizing photos from iCloud" = "Синхронизиране на снимки от iCloud";
"iCloud Loading Error" = "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
View file @ de0f0752
......@@ -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 Loading Error" = "iCloud Nemůžu synchronizovat";
"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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "Wird bearbeitet...";
"No Photos or Videos" = "Keine Fotos oder Videos";
"Synchronizing photos from iCloud" = "Fotos aus iCloud synchronisieren";
"iCloud Loading Error" = "iCloud Kann nicht synchronisieren";
"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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "Επεξεργασία...";
"No Photos or Videos" = "Δεν υπάρχουν φωτογραφίες ή βίντεο";
"Synchronizing photos from iCloud" = "Συγχρονισμός φωτογραφιών από το iCloud";
"iCloud Loading Error" = "iCloud δεν μπορεί να συγχρονιστεί";
"Can not use camera" = "Δεν είναι δυνατή η χρήση της κάμερας";
"Can not choose both video and photo" = "Δεν είναι δυνατή η επιλογή του βίντεο και της φωτογραφίας";
"Can not choose both photo and GIF" = "Δεν είναι δυνατή η επιλογή φωτογραφίας και GIF";
TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle/es.lproj/Localizable.strings
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "Tratamiento...";
"No Photos or Videos" = "No hay fotos o videos";
"Synchronizing photos from iCloud" = "Sincronizando fotos desde iCloud";
"iCloud Loading Error" = "iCloud Imposible sincronizar";
"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
View file @ de0f0752
......@@ -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 Loading Error" = "iCloud Impossible de synchroniser";
"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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "מעבד...";
"No Photos or Videos" = "אין תמונות או סרטונים";
"Synchronizing photos from iCloud" = "סנכרון תמונות מ - iCloud";
"iCloud Loading Error" = "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
View file @ de0f0752
......@@ -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 Loading Error" = "iCloud non può sincronizzare";
"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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "処理...";
"No Photos or Videos" = "写真やビデオはありません";
"Synchronizing photos from iCloud" = "iCloudから写真を同期する";
"iCloud Loading Error" = "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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "처리...";
"No Photos or Videos" = "아무 사진이 나 동영상";
"Synchronizing photos from iCloud" = "ICloud에서 사진을 동기화";
"iCloud Loading Error" = "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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "처리 중 ...";
"No Photos or Videos" = "사진이나 동영상 없음";
"Synchronizing photos from iCloud" = "iCloud에서 사진 동기화";
"iCloud Loading Error" = "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
View file @ de0f0752
......@@ -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 Loading Error" = "iCloud kan niet synchroniseren";
"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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "Przetwarzanie...";
"No Photos or Videos" = "Brak zdjęć lub filmów";
"Synchronizing photos from iCloud" = "Synchronizowanie zdjęć z iCloud";
"iCloud Loading Error" = "iCloud nie może synchronizować";
"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
View file @ de0f0752
......@@ -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 Loading Error" = "iCloud não Pode sincronizar";
"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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "Prelucrare...";
"No Photos or Videos" = "Nu există fotografii sau videoclipuri";
"Synchronizing photos from iCloud" = "Sincronizarea fotografiilor cu iCloud";
"iCloud Loading Error" = "iCloud nu poate sincroniza";
"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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "Обработка ...";
"No Photos or Videos" = "Нет фото или видео";
"Synchronizing photos from iCloud" = "Синхронизация фотографий из iCloud";
"iCloud Loading Error" = "синхронизация 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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "Spracovanie ...";
"No Photos or Videos" = "Žiadne fotografie alebo videá";
"Synchronizing photos from iCloud" = "Synchronizácia fotografií z iCloud";
"iCloud Loading Error" = "iCloud nemôže synchronizovať";
"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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "Bearbetning ...";
"No Photos or Videos" = "Inga foton eller videor";
"Synchronizing photos from iCloud" = "Synkronisera foton från iCloud";
"iCloud Loading Error" = "iCloud kan inte synkronisera";
"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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "กำลังประมวลผล ...";
"No Photos or Videos" = "ไม่มีรูปภาพหรือวิดีโอ";
"Synchronizing photos from iCloud" = "การซิงโครไนซ์ภาพถ่ายจาก iCloud";
"iCloud Loading Error" = "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
View file @ de0f0752
......@@ -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 Loading Error" = "iCloud sinkronizamıyor";
"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
View file @ de0f0752
......@@ -12,6 +12,7 @@
"Processing..." = "Обробка ...";
"No Photos or Videos" = "Немає фотографій або відео";
"Synchronizing photos from iCloud" = "Синхронізація фотографій з iCloud";
"iCloud Loading Error" = "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
View file @ de0f0752
......@@ -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 Loading Error" = "iCloud Không đồng bộ";
"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/TZPhotoPreviewCell.h
View file @ de0f0752
......@@ -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
View file @ de0f0752
......@@ -134,6 +134,22 @@
_imageView.clipsToBounds = YES;
[_imageContainerView addSubview:_imageView];
_iCloudErrorView = [[UIView alloc] initWithFrame:CGRectMake(0, [TZCommonTools tz_isIPhoneX] ? 88 : 64, 150, 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, 150 - 40, 28);
label.font = [UIFont systemFontOfSize:10];
label.textColor = [UIColor whiteColor];
label.text = @"iCloud无法同步";
[_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 +175,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 +226,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
View file @ de0f0752
......@@ -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, 150, 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, 150 - 40, 28);
label.font = [UIFont systemFontOfSize:10];
label.textColor = [UIColor whiteColor];
label.text = @"iCloud无法同步";
[_iCloudErrorView addSubview:label];
[self.view addSubview:_iCloudErrorView];
_iCloudErrorView.hidden = YES;
}
return _iCloudErrorView;
}
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment