Merge branch 'Wtrwx/main'

Author: huami1314

.gitignore

@@ -1,3 +1,5 @@
 .theos
 packages
-.DS_Store
+.DS_Store
+Aweme
+Makefile.local

AWMSafeDispatchTimer.h

@@ -0,0 +1,19 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AWMSafeDispatchTimer : NSObject
+
+- (void)startWithInterval:(NSTimeInterval)interval
+                   leeway:(NSTimeInterval)leeway
+                    queue:(dispatch_queue_t)queue
+                 repeats:(BOOL)repeats
+                 handler:(dispatch_block_t)handler;
+
+- (void)cancel;
+
+@property (nonatomic, readonly, getter=isRunning) BOOL running;
+
+@end
+
+NS_ASSUME_NONNULL_END

AWMSafeDispatchTimer.m

@@ -0,0 +1,123 @@
+#import "AWMSafeDispatchTimer.h"
+
+
+static const void *kAWMSafeDispatchTimerSpecificKey = &kAWMSafeDispatchTimerSpecificKey;
+
+@interface AWMSafeDispatchTimer ()
+@property (nonatomic, strong, nullable) dispatch_source_t internalTimer;
+@property (nonatomic, assign) BOOL resumed;
+@property (nonatomic, copy, nullable) dispatch_block_t internalHandler;
+@property (nonatomic, strong) dispatch_queue_t synchronizationQueue;
+@property (nonatomic, assign, getter=isRunning) BOOL running;
+@end
+
+@implementation AWMSafeDispatchTimer
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        _synchronizationQueue = dispatch_queue_create("com.dyyy.safeDispatchTimer", DISPATCH_QUEUE_SERIAL);
+        dispatch_queue_set_specific(_synchronizationQueue, kAWMSafeDispatchTimerSpecificKey, (__bridge void *)self, NULL);
+    }
+    return self;
+}
+
+- (void)startWithInterval:(NSTimeInterval)interval
+                   leeway:(NSTimeInterval)leeway
+                    queue:(dispatch_queue_t)queue
+                 repeats:(BOOL)repeats
+                 handler:(dispatch_block_t)handler {
+    if (interval <= 0.0) {
+        interval = 0.1;
+    }
+    dispatch_time_t startTime = dispatch_time(DISPATCH_TIME_NOW, (int64_t)(interval * NSEC_PER_SEC));
+    uint64_t repeatInterval = repeats ? (uint64_t)(interval * NSEC_PER_SEC) : DISPATCH_TIME_FOREVER;
+    uint64_t tolerance = leeway > 0 ? (uint64_t)(leeway * NSEC_PER_SEC) : (uint64_t)(0.1 * NSEC_PER_SEC);
+
+    __weak __typeof(self) weakSelf = self;
+    dispatch_async(self.synchronizationQueue, ^{
+      __strong __typeof(weakSelf) strongSelf = weakSelf;
+      if (!strongSelf) {
+          return;
+      }
+
+      [strongSelf cancelLocked];
+
+      dispatch_queue_t targetQueue = queue ?: dispatch_get_main_queue();
+      dispatch_source_t timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, targetQueue);
+      if (!timer) {
+          return;
+      }
+
+      strongSelf.internalTimer = timer;
+      strongSelf.internalHandler = handler;
+
+      dispatch_source_set_timer(timer, startTime, repeatInterval, tolerance);
+      dispatch_source_set_event_handler(timer, ^{
+        __strong __typeof(weakSelf) innerSelf = weakSelf;
+        if (!innerSelf) {
+            return;
+        }
+        dispatch_block_t block = innerSelf.internalHandler;
+        if (block) {
+            block();
+        }
+        if (!repeats) {
+            [innerSelf cancel];
+        }
+      });
+
+      if (!strongSelf.resumed) {
+          dispatch_resume(timer);
+          strongSelf.resumed = YES;
+      }
+
+      strongSelf.running = YES;
+    });
+}
+
+- (void)cancel {
+    dispatch_async(self.synchronizationQueue, ^{
+      [self cancelLocked];
+    });
+}
+
+- (void)cancelLocked {
+    if (!self.internalTimer) {
+        return;
+    }
+
+    dispatch_source_t timer = self.internalTimer;
+    self.internalHandler = nil;
+    self.internalTimer = nil;
+
+    dispatch_source_set_event_handler(timer, ^{});
+
+    if (self.resumed) {
+        dispatch_source_cancel(timer);
+        self.resumed = NO;
+    }
+
+    self.running = NO;
+}
+
+- (BOOL)isRunning {
+    if (dispatch_get_specific(kAWMSafeDispatchTimerSpecificKey) == (__bridge void *)self) {
+        return _running;
+    }
+
+    __block BOOL runningState = NO;
+    dispatch_sync(self.synchronizationQueue, ^{
+      runningState = _running;
+    });
+    return runningState;
+}
+
+- (void)dealloc {
+    if (self.synchronizationQueue) {
+        dispatch_queue_set_specific(self.synchronizationQueue, kAWMSafeDispatchTimerSpecificKey, NULL, NULL);
+    }
+    [self cancel];
+}
+
+@end

AwemeHeaders.h

@@ -7,9 +7,20 @@
 #define DYYYGetInteger(key) [[NSUserDefaults standardUserDefaults] integerForKey:key]
 #define DYYYGetString(key) [[NSUserDefaults standardUserDefaults] stringForKey:key]
 #define DYYY_IGNORE_GLOBAL_ALPHA_TAG 114514
+
 typedef NS_ENUM(NSInteger, MediaType) { MediaTypeVideo, MediaTypeImage, MediaTypeAudio, MediaTypeHeic };
 
-static __weak UICollectionView *gFeedCV = nil;
+// 调节模式&全局状态
+typedef NS_ENUM(NSUInteger, DYEdgeMode) {
+    DYEdgeModeNone = 0,
+    DYEdgeModeBrightness = 1,
+    DYEdgeModeVolume = 2,
+};
+
+@interface UIView (DYYYGlobalAlpha)
+- (void)dyyy_applyGlobalTransparency;
+@end
+
 // 音量控制
 @interface AVSystemController : NSObject
 + (instancetype)sharedAVSystemController;
@@ -21,15 +32,6 @@ static __weak UICollectionView *gFeedCV = nil;
 + (instancetype)sharedInstance;
 - (void)presentHUDWithIcon:(NSString *)name level:(float)level;
 @end
-// 调节模式&全局状态
-typedef NS_ENUM(NSUInteger, DYEdgeMode) {
-    DYEdgeModeNone = 0,
-    DYEdgeModeBrightness = 1,
-    DYEdgeModeVolume = 2,
-};
-static DYEdgeMode gMode = DYEdgeModeNone;
-static CGFloat gStartY = 0.0;
-static CGFloat gStartVal = 0.0;
 
 @interface URLModel : NSObject
 @property(nonatomic, strong) NSArray *originURLList;
@@ -122,6 +124,7 @@ static CGFloat gStartVal = 0.0;
 @property(nonatomic, assign) BOOL isAds;
 @property(nonatomic, assign) BOOL isLive;
 @property(nonatomic, assign) BOOL isLivePhoto;
+@property(nonatomic, assign) BOOL isNewTextMode;  // 文字图文专有属性
 @property(nonatomic, strong) NSString *shareURL;
 @property(nonatomic, strong) id hotSpotLynxCardModel;
 @property(nonatomic, strong) AWELiveFollowFeedCellModel *cellRoom;
@@ -136,6 +139,7 @@ static CGFloat gStartVal = 0.0;
 @property(nonatomic, strong) AWEAwemeStatisticsModel *statistics;
 @property(nonatomic, strong) AWEPropGuideV2Model *propGuideV2;
 @property(nonatomic, strong) AWEECommerceLabel *ecommerceBelowLabel;
+@property(nonatomic, assign) BOOL isShowLandscapeEntryView;
 - (BOOL)isLive;
 - (BOOL)contentFilter;
 - (AWESearchAwemeExtraModel *)searchExtraModel;
@@ -148,6 +152,25 @@ static CGFloat gStartVal = 0.0;
 - (void)setListenVideoStatus:(NSInteger)status;
 @end
 
+@interface AWEABTestManager : NSObject
+@property(retain, nonatomic) NSMutableDictionary *consistentABTestDic;
+@property(copy, nonatomic) NSDictionary *abTestData;
+@property(copy, nonatomic) NSDictionary *performanceReversalDic;
+@property(nonatomic) BOOL performanceReversalEnabled;
+@property(nonatomic) BOOL handledNetFirstBackNotification;
+@property(nonatomic) BOOL lastUpdateByIncrement;
+@property(nonatomic) BOOL shouldPrintLog;
+@property(nonatomic) BOOL localABSettingEnabled;
+- (void)fetchConfiguration:(id)arg1;
+- (void)fetchConfigurationWithRetry:(BOOL)arg1 completion:(id)arg2;
+- (void)incrementalUpdateData:(id)arg1 unchangedKeyList:(id)arg2;
+- (void)overrideABTestData:(id)arg1 needCleanCache:(BOOL)arg2;
+- (void)setAbTestData:(id)arg1;
+- (void)_saveABTestData:(id)arg1;
+- (id)getValueOfConsistentABTestWithKey:(id)arg1;
++ (id)sharedManager;
+@end
+
 @interface AWELongPressPanelBaseViewModel : NSObject
 @property(nonatomic, copy) NSString *describeString;
 @property(nonatomic, assign) NSInteger enterMethod;
@@ -162,6 +185,10 @@ static CGFloat gStartVal = 0.0;
 - (void)setAction:(void (^)(void))action;
 @end
 
+@interface AWEPlayVideoViewController : UIViewController
+@property(nonatomic, strong) AWEAwemeModel *model;
+@end
+
 @interface AWELongPressPanelViewGroupModel : NSObject
 @property(nonatomic) unsigned long long groupType;
 @property(nonatomic) NSArray *groupArr;
@@ -205,6 +232,9 @@ static CGFloat gStartVal = 0.0;
 @interface AWEFeedContainerContentView : UIView
 @end
 
+@interface TTMetalView : UIView
+@end
+
 @interface AWELeftSideBarEntranceView : UIView
 - (void)setNumericalRedDot:(id)numericalRedDot;
 - (void)setRedDot:(id)redDot;
@@ -352,6 +382,9 @@ static CGFloat gStartVal = 0.0;
 @interface AWENormalModeTabBar : UIView
 @property(nonatomic, assign, readonly) UITabBarController *yy_viewController;
 @property(retain, nonatomic) AWETabBarSkinContainerView *skinContainerView;
+- (void)initializeOriginalTabBarHeight;
+- (void)calculateTabBarHeight;
+- (BOOL)applyTabBarHeight;
 @end
 
 @interface AWEPlayInteractionListenFeedView : UIView
@@ -494,8 +527,15 @@ static CGFloat gStartVal = 0.0;
 @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;
@@ -510,11 +550,13 @@ static CGFloat gStartVal = 0.0;
 
 @interface AWECommentLongPressPanelParam : NSObject
 - (AWECommentModel *)selectdComment;
+- (NSDictionary *)extraParams;
 @end
 
 @interface AWECommentModel : NSObject
 - (AWEIMStickerModel *)sticker;
 - (NSString *)content;
+- (NSArray<AWECommentImageModel *> *)imageList;
 @end
 
 @interface AWEIMStickerModel : NSObject
@@ -572,6 +614,10 @@ static CGFloat gStartVal = 0.0;
 @property(nonatomic, assign, getter=isHidden) BOOL hidden;
 @end
 
+@interface AWEIMMessageTabSideBarView : UIView
+@property(nonatomic, strong, readonly) UIView *superview;
+@end
+
 @interface AWEECommerceEntryView : UIView
 @property(nonatomic, strong, readonly) UIView *superview;
 @property(nonatomic, assign, getter=isHidden) BOOL hidden;
@@ -1360,4 +1406,7 @@ static CGFloat gStartVal = 0.0;
 @end
 
 @interface AWEListKitMagicCollectionView : UICollectionView
-@end
+@end
+
+@interface TTPlayerView : UIView
+@end