Merge branch 'main' of https://github.com/Wtrwx/DYYY-Private

Wtrwx · Wtrwx · commit a645fbf36305 · 2025-12-23T21:53:36.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 packages
 .DS_Store
 Aweme
+Makefile.local
diff --git a/AwemeHeaders.h b/AwemeHeaders.h
@@ -525,8 +525,15 @@ typedef NS_ENUM(NSUInteger, DYEdgeMode) {
 @property(nonatomic, copy) NSString *accessibilityLabel;
 @end
 
+// 评论区实况照片模型
+@interface AWECommentLivePhotoModel : NSObject
+@property(nonatomic, copy) NSArray *videoUrl;
+@end
+
 @interface AWECommentImageModel : NSObject
-@property(nonatomic, copy) NSString *originUrl;
+@property(nonatomic, strong) AWEURLModel *originUrl;
+@property(nonatomic, strong) AWEURLModel *mediumUrl;
+@property(nonatomic, strong) AWECommentLivePhotoModel *livePhotoModel;
 @end
 
 @class AWECommentModel;
@@ -541,11 +548,13 @@ typedef NS_ENUM(NSUInteger, DYEdgeMode) {
 
 @interface AWECommentLongPressPanelParam : NSObject
 - (AWECommentModel *)selectdComment;
+- (NSDictionary *)extraParams;
 @end
 
 @interface AWECommentModel : NSObject
 - (AWEIMStickerModel *)sticker;
 - (NSString *)content;
+- (NSArray<AWECommentImageModel *> *)imageList;
 @end
 
 @interface AWEIMStickerModel : NSObject
diff --git a/DYYY.xm b/DYYY.xm
@@ -2126,35 +2126,98 @@ static BOOL dyyyShouldUseLastStickerURL = NO;
 }
 
 - (void)elementTapped {
-    if (!DYYYGetBool(@"DYYYForceDownloadEmotion")) {
-        %orig;
-        return;
-    }
     AWECommentLongPressPanelContext *context = [self commentPageContext];
-    AWECommentModel *selected = [context selectdComment] ?: [[context params] selectdComment];
-    AWEIMStickerModel *sticker = [selected sticker];
-    NSArray *originURLList = sticker.staticURLModel.originURLList;
-    if (originURLList.count == 0) {
-        %orig;
-        return;
+    AWECommentLongPressPanelParam *params = [context params];
+    AWECommentModel *comment = [context selectdComment] ?: [params selectdComment];
+    
+    // 判断是表情包还是图片
+    AWEIMStickerModel *sticker = [comment sticker];
+    NSArray *stickerURLList = sticker.staticURLModel.originURLList;
+    BOOL hasSticker = (stickerURLList.count > 0);
+    
+    NSArray *imageList = nil;
+    if ([comment respondsToSelector:@selector(imageList)]) {
+        imageList = [comment imageList];
+    }
+    BOOL hasImages = (imageList && imageList.count > 0);
+    
+    // 表情包保存逻辑
+    if (hasSticker && DYYYGetBool(@"DYYYForceDownloadEmotion")) {
+        NSString *urlString = dyyyShouldUseLastStickerURL ? stickerURLList.lastObject : stickerURLList.firstObject;
+        dyyyShouldUseLastStickerURL = NO;
+        NSURL *stickerURL = [NSURL URLWithString:urlString];
+        
+        if (stickerURL) {
+            [DYYYManager downloadMedia:stickerURL
+                             mediaType:MediaTypeHeic
+                                 audio:nil
+                            completion:^(BOOL success) {
+                              if (!success && stickerURLList.count > 1) {
+                                  dyyyShouldUseLastStickerURL = YES;
+                              }
+                            }];
+            return;
+        }
     }
-
-    NSString *urlString = dyyyShouldUseLastStickerURL ? originURLList.lastObject : originURLList.firstObject;
-    dyyyShouldUseLastStickerURL = NO;
-    NSURL *heifURL = [NSURL URLWithString:urlString];
-    if (!heifURL) {
-        %orig;
+    
+    // 图片保存逻辑
+    if (hasImages && DYYYGetBool(@"DYYYForceDownloadCommentImage")) {
+        // 检查 is_pic_inflow 判断是保存全部还是单张
+        // is_pic_inflow = 1: 点开具体图片后长按 -> 只保存当前图片
+        // is_pic_inflow = 0: 直接在评论区长按 -> 保存全部图片
+        NSDictionary *extraParams = [params extraParams];
+        BOOL isPicInflow = NO;
+        if (extraParams && [extraParams isKindOfClass:[NSDictionary class]]) {
+            id isPicInflowValue = extraParams[@"is_pic_inflow"];
+            if (isPicInflowValue) {
+                isPicInflow = [isPicInflowValue integerValue] == 1;
+            }
+        }
+        
+        NSInteger currentIndex = -1; // -1 表示保存全部
+        
+        if (isPicInflow) {
+            // 使用 DYYYUtils 封装的方法查找目标控制器
+            UIViewController *topVC = [DYYYUtils topView];
+            
+            // 获取 Ivar 定义的类和目标控制器类
+            Class ivarClass = NSClassFromString(@"AWECommentMediaFeedSwfitImpl.CommentMediaFeedCellViewController");
+            Class targetClass = NSClassFromString(@"AWECommentMediaFeedSwfitImpl.CommentMediaFeedCommonImageCellViewController");
+            
+            if (ivarClass && targetClass && topVC) {
+                Ivar multiIndexIvar = class_getInstanceVariable(ivarClass, "currentIndexInMultiImageList");
+                if (multiIndexIvar) {
+                    UIViewController *cellVC = [DYYYUtils findViewControllerOfClass:targetClass inViewController:topVC];
+                    if (cellVC) {
+                        ptrdiff_t offset = ivar_getOffset(multiIndexIvar);
+                        NSInteger *ptr = (NSInteger *)((char *)(__bridge void *)cellVC + offset);
+                        currentIndex = *ptr;
+                    }
+                }
+            }
+        }
+        
+        NSString *hint = (currentIndex >= 0) ? @"正在保存当前图片..." : 
+            [NSString stringWithFormat:@"正在保存 %lu 张图片...", (unsigned long)imageList.count];
+        [DYYYUtils showToast:hint];
+        
+        [DYYYManager saveCommentImages:imageList
+                            currentIndex:currentIndex
+                            completion:^(NSInteger successCount, NSInteger livePhotoCount, NSInteger failedCount) {
+            NSMutableString *message = [NSMutableString stringWithFormat:@"成功保存 %ld 张", (long)successCount];
+            if (livePhotoCount > 0) {
+                [message appendFormat:@"\n(含 %ld 张实况照片)", (long)livePhotoCount];
+            }
+            if (failedCount > 0) {
+                [message appendFormat:@"\n失败 %ld 张", (long)failedCount];
+            }
+            [DYYYUtils showToast:message];
+        }];
         return;
     }
-
-    [DYYYManager downloadMedia:heifURL
-                     mediaType:MediaTypeHeic
-                         audio:nil
-                    completion:^(BOOL success) {
-                      if (!success && originURLList.count > 1) {
-                          dyyyShouldUseLastStickerURL = YES;
-                      }
-                    }];
+    
+    // 默认行为
+    %orig;
 }
 
 %end
diff --git a/DYYYManager.h b/DYYYManager.h
@@ -85,6 +85,16 @@
                                  progress:(void (^)(NSInteger current, NSInteger total))progressBlock
                                completion:(void (^)(NSInteger successCount, NSInteger totalCount))completion;
 
+/**
+ * 保存评论区图片（支持普通图片和实况照片）
+ * @param imageModels 评论图片模型数组（AWECommentImageModel）
+ * @param currentIndex 当前图片索引（-1 表示保存全部）
+ * @param completion 完成回调
+ */
++ (void)saveCommentImages:(NSArray *)imageModels
+             currentIndex:(NSInteger)currentIndex
+               completion:(void (^)(NSInteger successCount, NSInteger livePhotoCount, NSInteger failedCount))completion;
+
 /**
  * 批量下载图片
  * @param imageURLs 图片URL数组
diff --git a/DYYYManager.m b/DYYYManager.m
@@ -1806,6 +1806,130 @@ - (void)deleteFile:(NSString *)file {
     }
 }
 
+#pragma mark - 评论区图片保存
+
++ (void)saveCommentImages:(NSArray *)imageModels
+             currentIndex:(NSInteger)currentIndex
+               completion:(void (^)(NSInteger successCount, NSInteger livePhotoCount, NSInteger failedCount))completion {
+    if (!imageModels || imageModels.count == 0) {
+        if (completion) completion(0, 0, 0);
+        return;
+    }
+    
+    // 确定要保存的图片
+    NSArray *imagesToSave = nil;
+    if (currentIndex >= 0 && currentIndex < (NSInteger)imageModels.count) {
+        imagesToSave = @[imageModels[currentIndex]];
+    } else {
+        imagesToSave = imageModels;
+    }
+    
+    // 分离普通图片和实况照片
+    NSMutableArray *normalImages = [NSMutableArray array];
+    NSMutableArray *livePhotos = [NSMutableArray array];
+    
+    for (id imageModel in imagesToSave) {
+        @try {
+            // 获取图片 URL - originUrl 和 mediumUrl 都是 AWEURLModel 类型
+            NSString *imageUrlStr = nil;
+            
+            // 首先尝试 originUrl
+            AWEURLModel *originUrlModel = [imageModel valueForKey:@"originUrl"];
+            if (originUrlModel) {
+                NSArray *urlList = [originUrlModel originURLList];
+                if (urlList && urlList.count > 0) {
+                    imageUrlStr = urlList.firstObject;
+                }
+            }
+            
+            // 如果 originUrl 没有获取到，尝试 mediumUrl
+            if (!imageUrlStr) {
+                AWEURLModel *mediumUrlModel = [imageModel valueForKey:@"mediumUrl"];
+                if (mediumUrlModel) {
+                    NSArray *urlList = [mediumUrlModel originURLList];
+                    if (urlList && urlList.count > 0) {
+                        imageUrlStr = urlList.firstObject;
+                    }
+                }
+            }
+            
+            NSLog(@"[DYYY] 评论图片URL: %@", imageUrlStr);
+            
+            if (!imageUrlStr || imageUrlStr.length == 0) {
+                NSLog(@"[DYYY] 无法获取图片URL，imageModel: %@", imageModel);
+                continue;
+            }
+            
+            // 检查是否是实况照片
+            id livePhotoModel = [imageModel valueForKey:@"livePhotoModel"];
+            if (livePhotoModel) {
+                NSArray *videoUrls = [livePhotoModel valueForKey:@"videoUrl"];
+                if (videoUrls && videoUrls.count > 0) {
+                    NSString *videoUrlStr = videoUrls.firstObject;
+                    if (videoUrlStr && videoUrlStr.length > 0) {
+                        // 传入字符串而不是 NSURL，与 downloadAllLivePhotosWithProgress 期望的格式一致
+                        [livePhotos addObject:@{
+                            @"imageURL": imageUrlStr,
+                            @"videoURL": videoUrlStr
+                        }];
+                        continue;
+                    }
+                }
+            }
+            
+            // 普通图片 - 存储字符串而不是 NSURL
+            [normalImages addObject:imageUrlStr];
+        } @catch (NSException *e) {
+            NSLog(@"[DYYY] 解析评论图片失败: %@", e);
+        }
+    }
+    
+    NSLog(@"[DYYY] 解析完成: 普通图片=%lu, 实况照片=%lu", (unsigned long)normalImages.count, (unsigned long)livePhotos.count);
+    
+    // 如果都没有解析到有效URL，直接返回失败
+    if (normalImages.count == 0 && livePhotos.count == 0) {
+        if (completion) completion(0, 0, (NSInteger)imagesToSave.count);
+        return;
+    }
+    
+    __block NSInteger successCount = 0;
+    __block NSInteger livePhotoCount = 0;
+    __block NSInteger failedCount = 0;
+    
+    dispatch_group_t group = dispatch_group_create();
+    
+    // 保存普通图片
+    if (normalImages.count > 0) {
+        dispatch_group_enter(group);
+        [self downloadAllImagesWithProgress:[normalImages mutableCopy]
+                                   progress:nil
+                                 completion:^(NSInteger imgSuccess, NSInteger imgTotal) {
+            successCount += imgSuccess;
+            failedCount += (imgTotal - imgSuccess);
+            dispatch_group_leave(group);
+        }];
+    }
+    
+    // 保存实况照片
+    if (livePhotos.count > 0) {
+        dispatch_group_enter(group);
+        [self downloadAllLivePhotosWithProgress:livePhotos
+                                       progress:nil
+                                     completion:^(NSInteger lpSuccess, NSInteger lpTotal) {
+            successCount += lpSuccess;
+            livePhotoCount = lpSuccess;
+            failedCount += (lpTotal - lpSuccess);
+            dispatch_group_leave(group);
+        }];
+    }
+    
+    dispatch_group_notify(group, dispatch_get_main_queue(), ^{
+        if (completion) {
+            completion(successCount, livePhotoCount, failedCount);
+        }
+    });
+}
+
 + (void)downloadAllLivePhotos:(NSArray<NSDictionary *> *)livePhotos {
     if (livePhotos.count == 0) {
         return;
diff --git a/DYYYSettings.xm b/DYYYSettings.xm
@@ -1956,6 +1956,14 @@ void showDYYYSettingsVC(UIViewController *rootVC, BOOL hasAgreed) {
             @"detail" : @"",
             @"cellType" : @6,
             @"imageName" : @"ic_removeimage_outlined_20"},
+        @{
+            @"identifier" : @"DYYYForceDownloadCommentImage",
+            @"title" : @"保存评论区图片",
+            @"subTitle" : @"长按评论可保存所有实况和图片",
+            @"detail" : @"",
+            @"cellType" : @37,
+            @"imageName" : @"ic_image_outlined"
+        },
         @{
             @"identifier" : @"DYYYForceDownloadEmotion",
             @"title" : @"保存评论区表情包",
diff --git a/Makefile b/Makefile
@@ -5,6 +5,8 @@
 #  Channel: @huamidev
 #  Created on: 2024/10/04
 #
+# 本地配置文件（可选）
+-include Makefile.local
 
 TARGET = iphone:clang:latest:14.0
 ARCHS = arm64 arm64e

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`# Channel: @huamidev`
`6`	`6`	`# Created on: 2024/10/04`
`7`	`7`	`#`
	`8`	`+# 本地配置文件（可选）`
	`9`	`+-include Makefile.local`
`8`	`10`
`9`	`11`	`TARGET = iphone:clang:latest:14.0`
`10`	`12`	`ARCHS = arm64 arm64e`