refactor: message media type

AVOS/LeanCloudObjcTests/LCIMConversationTestCase.swift

@@ -735,6 +735,7 @@ class LCIMConversationTestCase: RTMBaseTestCase {
             conv.read()
         }
         wait(for: [allReadExp], timeout: timeout)
+        delegator.reset()
     }
 
     func testMembersChange() {

AVOS/LeanCloudObjcTests/LCIMMessageTestCase.swift

@@ -1431,7 +1431,7 @@ class LCIMMessageTestCase: RTMBaseTestCase {
         wait(for: [intervalQueryExp], timeout: timeout)
 
         let typeQuery = expectation(description: "type query")
-        conversation?.queryMediaMessagesFromServer(with: .text, limit: 10, fromMessageId: nil, fromTimestamp: 0, callback: { msgs, error in
+        conversation?.queryMediaMessagesFromServer(withType: .text, limit: 10, fromMessageId: nil, fromTimestamp: 0, callback: { msgs, error in
             XCTAssertNil(error)
             XCTAssertEqual(msgs?.count, 1)
             XCTAssertNotNil(msgs?.first?.deliveredTimestamp)
@@ -1450,14 +1450,14 @@ extension LCIMMessageTestCase {
     typealias ConversationSuite = (client: LCIMClient, delegator: LCIMClientDelegator, conversation: LCIMConversation)
 
     class CustomMessage: LCIMTypedMessage, LCIMTypedMessageSubclassing {
-        static func classMediaType() -> MessageMediaType {
-            return 1
+        static func classMediaType() -> LCIMMessageMediaType {
+            return LCIMMessageMediaType(1)
         }
     }
 
     class InvalidCustomMessage: LCIMTypedMessage, LCIMTypedMessageSubclassing {
-        static func classMediaType() -> MessageMediaType {
-            return -1
+        static func classMediaType() -> LCIMMessageMediaType {
+            return LCIMMessageMediaType(-1)
         }
     }
 

AVOS/Sources/Realtime/IM/Conversation/LCIMConversation.m

@@ -1341,69 +1341,59 @@ - (void)fillTypedMessage:(LCIMTypedMessage *)typedMessage withFile:(LCFile *)fil
 {
     NSMutableDictionary *metaData = (file.metaData.mutableCopy
                                      ?: [NSMutableDictionary dictionary]);
-    switch (typedMessage.mediaType) {
-        case kLCIMMessageMediaTypeImage:
-        {
-            double width = [metaData[@"width"] doubleValue];
-            double height = [metaData[@"height"] doubleValue];
-            if (!(width > 0 && height > 0)) {
+    if (typedMessage.mediaType == LCIMMessageMediaTypeImage) {
+        double width = [metaData[@"width"] doubleValue];
+        double height = [metaData[@"height"] doubleValue];
+        if (!(width > 0 && height > 0)) {
 #if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_WATCH
-                UIImage *image = ({
-                    UIImage *image;
-                    NSString *cachedPath = file.persistentCachePath;
-                    if ([[NSFileManager defaultManager] fileExistsAtPath:cachedPath]) {
-                        NSData *data = [NSData dataWithContentsOfFile:cachedPath];
-                        image = [UIImage imageWithData:data];
-                    }
-                    image;
-                });
-                width = image.size.width * image.scale;
-                height = image.size.height * image.scale;
-#elif TARGET_OS_OSX
-                NSImage *image = ({
-                    NSImage *image;
-                    NSString *cachedPath = file.persistentCachePath;
-                    if ([[NSFileManager defaultManager] fileExistsAtPath:cachedPath]) {
-                        NSData *data = [NSData dataWithContentsOfFile:cachedPath];
-                        image = [[NSImage alloc] initWithData:data];
-                    }
-                    image;
-                });
-                width = image.size.width;
-                height = image.size.height;
-#endif
-                if (width > 0) {
-                    metaData[@"width"] = @(width);
+            UIImage *image = ({
+                UIImage *image;
+                NSString *cachedPath = file.persistentCachePath;
+                if ([[NSFileManager defaultManager] fileExistsAtPath:cachedPath]) {
+                    NSData *data = [NSData dataWithContentsOfFile:cachedPath];
+                    image = [UIImage imageWithData:data];
                 }
-                if (height > 0) {
-                    metaData[@"height"] = @(height);
+                image;
+            });
+            width = image.size.width * image.scale;
+            height = image.size.height * image.scale;
+#elif TARGET_OS_OSX
+            NSImage *image = ({
+                NSImage *image;
+                NSString *cachedPath = file.persistentCachePath;
+                if ([[NSFileManager defaultManager] fileExistsAtPath:cachedPath]) {
+                    NSData *data = [NSData dataWithContentsOfFile:cachedPath];
+                    image = [[NSImage alloc] initWithData:data];
                 }
+                image;
+            });
+            width = image.size.width;
+            height = image.size.height;
+#endif
+            if (width > 0) {
+                metaData[@"width"] = @(width);
+            }
+            if (height > 0) {
+                metaData[@"height"] = @(height);
             }
         }
-            break;
-        case kLCIMMessageMediaTypeAudio:
-        case kLCIMMessageMediaTypeVideo:
-        {
-            double seconds = [metaData[@"duration"] doubleValue];
-            if (!(seconds > 0)) {
-                NSString *path = file.persistentCachePath;
-                if ([[NSFileManager defaultManager] fileExistsAtPath:path]) {
-                    NSURL *fileURL = [NSURL fileURLWithPath:path];
-                    if (fileURL) {
-                        AVURLAsset* audioAsset = [AVURLAsset URLAssetWithURL:fileURL
-                                                                     options:nil];
-                        seconds = CMTimeGetSeconds(audioAsset.duration);
-                        if (seconds > 0) {
-                            metaData[@"duration"] = @(seconds);
-                        }
+    } else if (typedMessage.mediaType == LCIMMessageMediaTypeAudio ||
+               typedMessage.mediaType == LCIMMessageMediaTypeVideo) {
+        double seconds = [metaData[@"duration"] doubleValue];
+        if (!(seconds > 0)) {
+            NSString *path = file.persistentCachePath;
+            if ([[NSFileManager defaultManager] fileExistsAtPath:path]) {
+                NSURL *fileURL = [NSURL fileURLWithPath:path];
+                if (fileURL) {
+                    AVURLAsset* audioAsset = [AVURLAsset URLAssetWithURL:fileURL
+                                                                 options:nil];
+                    seconds = CMTimeGetSeconds(audioAsset.duration);
+                    if (seconds > 0) {
+                        metaData[@"duration"] = @(seconds);
                     }
                 }
             }
         }
-            break;
-        case kLCIMMessageMediaTypeFile:
-        default:
-            break;
     }
     NSString *fileName = file.name;
     if (fileName) {

AVOS/Sources/Realtime/IM/Message/LCIMMessage.h

@@ -8,7 +8,17 @@
 
 #import "LCIMCommon.h"
 
-typedef NS_ENUM(int32_t, LCIMMessageMediaType) {
+typedef int32_t LCIMMessageMediaType NS_TYPED_EXTENSIBLE_ENUM;
+FOUNDATION_EXPORT const LCIMMessageMediaType LCIMMessageMediaTypeNone;
+FOUNDATION_EXPORT const LCIMMessageMediaType LCIMMessageMediaTypeText;
+FOUNDATION_EXPORT const LCIMMessageMediaType LCIMMessageMediaTypeImage;
+FOUNDATION_EXPORT const LCIMMessageMediaType LCIMMessageMediaTypeAudio;
+FOUNDATION_EXPORT const LCIMMessageMediaType LCIMMessageMediaTypeVideo;
+FOUNDATION_EXPORT const LCIMMessageMediaType LCIMMessageMediaTypeLocation;
+FOUNDATION_EXPORT const LCIMMessageMediaType LCIMMessageMediaTypeFile;
+FOUNDATION_EXPORT const LCIMMessageMediaType LCIMMessageMediaTypeRecalled;
+
+typedef NS_ENUM(int32_t, kLCIMMessageMediaType) {
     kLCIMMessageMediaTypeNone = 0,
     kLCIMMessageMediaTypeText = -1,
     kLCIMMessageMediaTypeImage = -2,
@@ -17,7 +27,7 @@ typedef NS_ENUM(int32_t, LCIMMessageMediaType) {
     kLCIMMessageMediaTypeLocation = -5,
     kLCIMMessageMediaTypeFile = -6,
     kLCIMMessageMediaTypeRecalled = -127
-};
+} __deprecated_enum_msg("Deprecated! please use `LCIMMessageMediaType` instead, this ENUM may be removed in the future.");
 
 typedef NS_ENUM(int8_t, LCIMMessageIOType) {
     LCIMMessageIOTypeIn = 1,

AVOS/Sources/Realtime/IM/Message/LCIMMessage.m

@@ -12,6 +12,15 @@
 #import "LCIMConversation_Internal.h"
 #import "LCIMTypedMessage_Internal.h"
 
+const LCIMMessageMediaType LCIMMessageMediaTypeNone     = 0;
+const LCIMMessageMediaType LCIMMessageMediaTypeText     = -1;
+const LCIMMessageMediaType LCIMMessageMediaTypeImage    = -2;
+const LCIMMessageMediaType LCIMMessageMediaTypeAudio    = -3;
+const LCIMMessageMediaType LCIMMessageMediaTypeVideo    = -4;
+const LCIMMessageMediaType LCIMMessageMediaTypeLocation = -5;
+const LCIMMessageMediaType LCIMMessageMediaTypeFile     = -6;
+const LCIMMessageMediaType LCIMMessageMediaTypeRecalled = -127;
+
 @implementation LCIMMessagePatchedReason
 
 @end

AVOS/Sources/Realtime/IM/TypedMessages/LCIMAudioMessage.m

@@ -18,7 +18,7 @@ + (void)load
 
 + (LCIMMessageMediaType)classMediaType
 {
-    return kLCIMMessageMediaTypeAudio;
+    return LCIMMessageMediaTypeAudio;
 }
 
 - (double)size {

AVOS/Sources/Realtime/IM/TypedMessages/LCIMFileMessage.m

@@ -18,7 +18,7 @@ + (void)load
 
 + (LCIMMessageMediaType)classMediaType
 {
-    return kLCIMMessageMediaTypeFile;
+    return LCIMMessageMediaTypeFile;
 }
 
 - (double)size {

AVOS/Sources/Realtime/IM/TypedMessages/LCIMImageMessage.m

@@ -18,7 +18,7 @@ + (void)load
 
 + (LCIMMessageMediaType)classMediaType
 {
-    return kLCIMMessageMediaTypeImage;
+    return LCIMMessageMediaTypeImage;
 }
 
 - (double)width {

AVOS/Sources/Realtime/IM/TypedMessages/LCIMLocationMessage.m

@@ -19,7 +19,7 @@ + (void)load
 
 + (LCIMMessageMediaType)classMediaType
 {
-    return kLCIMMessageMediaTypeLocation;
+    return LCIMMessageMediaTypeLocation;
 }
 
 + (instancetype)messageWithText:(NSString *)text

AVOS/Sources/Realtime/IM/TypedMessages/LCIMRecalledMessage.m

@@ -20,7 +20,7 @@ + (void)load
 
 + (LCIMMessageMediaType)classMediaType
 {
-    return kLCIMMessageMediaTypeRecalled;
+    return LCIMMessageMediaTypeRecalled;
 }
 
 @end

AVOS/Sources/Realtime/IM/TypedMessages/LCIMTextMessage.m

@@ -18,7 +18,7 @@ + (void)load
 
 + (LCIMMessageMediaType)classMediaType
 {
-    return kLCIMMessageMediaTypeText;
+    return LCIMMessageMediaTypeText;
 }
 
 + (instancetype)messageWithText:(NSString *)text

AVOS/Sources/Realtime/IM/TypedMessages/LCIMTypedMessage.h

@@ -11,9 +11,6 @@
 @class LCFile;
 @class LCGeoPoint;
 
-
-typedef int32_t MessageMediaType;
-
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol LCIMTypedMessageSubclassing <NSObject>
@@ -23,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// The type of the typed message,
 /// The zero and negative number is reserved for default typed message,
 /// Any other typed message should use positive number.
-+ (MessageMediaType)classMediaType;
++ (LCIMMessageMediaType)classMediaType;
 
 @end
 

AVOS/Sources/Realtime/IM/TypedMessages/LCIMVideoMessage.m

@@ -18,7 +18,7 @@ + (void)load
 
 + (LCIMMessageMediaType)classMediaType
 {
-    return kLCIMMessageMediaTypeVideo;
+    return LCIMMessageMediaTypeVideo;
 }
 
 - (double)size {

main.swift

@@ -61,6 +61,7 @@ class Task {
                 completion?($0)
                 group.leave()
             }
+            print("Run Task: \(self.task.arguments?[0] ?? "") \(self.task.arguments?[1] ?? "") ...")
             try self.task.run()
             self.task.waitUntilExit()
         } catch {