Merge branch 'master' of https://github.com/reactnativecomponent/react-native-imui

Author: hzlgit

android/messagelist/src/main/java/cn/jiguang/imui/utils/PhotoViewPagerViewUtil.java

@@ -176,6 +176,9 @@ public void onClick(View v) {
     }
 
     public static void saveImageToAlbum(String imagePath, Context context) {
+        if(TextUtils.isEmpty(imagePath)){
+            return;
+        }
         File imageFile = new File(imagePath);
         if (imageFile.exists()) {
             try {

ios/RCTAuroraIMUI.xcodeproj/project.pbxproj

@@ -1071,7 +1071,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = "";
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../ios/Pods/**";
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../ios/Pods/Headers/Public/**";
 				INFOPLIST_FILE = RCTAuroraIMUI/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -1097,7 +1097,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = "";
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../ios/Pods/**";
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../ios/Pods/Headers/Public/**";
 				INFOPLIST_FILE = RCTAuroraIMUI/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

ios/RCTAuroraIMUI/DWCustomView/DWOrigImageView.m

@@ -10,6 +10,7 @@
 
 #import "DWOrigImageView.h"
 #import "UIView+Extend.h"
+#import <Photos/Photos.h>
 //#import "DWContentScrollView.h"
 
 
@@ -93,7 +94,30 @@ - (void)addContentView{
 
 
 - (void)saveImage{
-    UIImageWriteToSavedPhotosAlbum(self.imgView.image, self, @selector(image:didFinishSavingWithError:contextInfo:), NULL);
+    // 判断授权状态
+    PHAuthorizationStatus status = [PHPhotoLibrary authorizationStatus];
+    if (status == PHAuthorizationStatusNotDetermined) { // 用户还没有做出选择
+        // 弹框请求用户授权
+        [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) {
+            if (status == PHAuthorizationStatusAuthorized) { // 用户第一次同意了访问相册权限
+                UIImageWriteToSavedPhotosAlbum(self.imgView.image, self, @selector(image:didFinishSavingWithError:contextInfo:), NULL);
+            }
+        }];
+    } else if (status == PHAuthorizationStatusAuthorized) { // 用户允许当前应用访问相册
+        NSLog(@"用户允许当前应用访问相册");
+        UIImageWriteToSavedPhotosAlbum(self.imgView.image, self, @selector(image:didFinishSavingWithError:contextInfo:), NULL);
+    } else if (status == PHAuthorizationStatusDenied) { // 用户拒绝当前应用访问相册
+        dispatch_async(dispatch_get_main_queue(), ^{
+            UIAlertView * alart = [[UIAlertView alloc]initWithTitle:@"温馨提示" message:@"请您设置允许APP访问您的照片\n设置>隐私>照片" delegate:self cancelButtonTitle:@"确定" otherButtonTitles:nil, nil];
+            [alart show];
+        });
+        
+    } else if (status == PHAuthorizationStatusRestricted) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            UIAlertView * alart = [[UIAlertView alloc]initWithTitle:@"温馨提示" message:@"由于系统限制, 无法访问相册" delegate:self cancelButtonTitle:@"确定" otherButtonTitles:nil, nil];
+            [alart show];
+        });
+    }
 }
 
 
@@ -163,8 +187,6 @@ - (void)clickPinchView:(UIPinchGestureRecognizer *)gest{
                     }
                 }
             }];
-            
-            
         }else{
             if (_contentScrollView.contentSize.width != view.width) {
                 if (view.height>screenH) {

ios/RCTAuroraIMUI/DWCustomView/DWOrigScorllView.m

@@ -194,7 +194,8 @@ - (void)addContentView{
 - (void)clickTapGest{
     NSMutableDictionary *tmpDict = self.imgArr[showIndex];
     NSString *strRect = [tmpDict objectForKey:@"rect"];
-    if (strRect.length) {
+    NSNumber *isEditNum = [tmpDict objectForKey:@"isEdit"];
+    if ((strRect.length)&& (!isEditNum.boolValue)) {
         CGRect rect = CGRectFromString(strRect);
         CGFloat scale = rect.size.width/screenW;
         CGFloat tmpY = rect.origin.y - (screenH * scale - rect.size.height)*0.5;

ios/RCTAuroraIMUI/IMUIMessageCollectionView/Views/IMUIBaseMessageCell.swift

@@ -223,12 +223,12 @@ open class IMUIBaseMessageCell: UICollectionViewCell, IMUIMessageCellProtocal,Me
   }
 
   func tapBubbleView() {
+    UIApplication.shared.keyWindow?.endEditing(true)
     if self.message?.type == .text {
-        self.delegate?.messageCollectionView?(tapCellView: "")
+//        self.delegate?.messageCollectionView?(tapCellView: "")
     }else if self.message?.type == .image {
         let strMsgID = (self.message?.msgId)! as NSString
         NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ShowOrigImageNotification"), object: strMsgID)
-        
 //        self.delegate?.messageCollectionView?(didTapImageMessageBubbleInCell:rect, model: self.message! )
         self.delegate?.messageCollectionView?(didTapMessageBubbleInCell: self, model: self.message!)
 
@@ -238,7 +238,8 @@ open class IMUIBaseMessageCell: UICollectionViewCell, IMUIMessageCellProtocal,Me
   }
 
     func tapCellView(){//点击整个cell，隐藏键盘
-        self.delegate?.messageCollectionView?(tapCellView: "")
+//        self.delegate?.messageCollectionView?(tapCellView: "")
+        UIApplication.shared.keyWindow?.endEditing(true)
     }
 
 

ios/RCTAuroraIMUI/RCTMessageListView.m

@@ -373,6 +373,7 @@ - (void)clickShowOrigImgView:(NSNotification *)noti{
         NSInteger count = [[UIApplication sharedApplication] keyWindow].subviews.count;
         topView = [[UIApplication sharedApplication] keyWindow].subviews[count - 2];
     }
+    BOOL isEdit = (self.height >= screenH*0.7) ? NO : YES;
     NSMutableArray *rectArr = [NSMutableArray array];
     for (UIView *tmpView in self.messageList.messageCollectionView.subviews) {
         if ([tmpView isKindOfClass:[IMUIBaseMessageCell class]] ) {
@@ -401,10 +402,11 @@ - (void)clickShowOrigImgView:(NSNotification *)noti{
                 for (NSMutableDictionary *tmpDict in rectArr) {
                     if ([msgID isEqualToString:[tmpDict objectForKey:@"msgId"]]) {
                         [imgDict setObject:[tmpDict objectForKey:@"rect"] forKey:@"rect"];
+                        NSNumber *number = [NSNumber numberWithBool:isEdit];
+                        [imgDict setObject:number forKey:@"isEdit"];
                         break;
                     }
                 }
-                
             }
             if (imgIndex > 0) {
                 UIWindow *win = [UIApplication sharedApplication].keyWindow;