diff --git a/Frameworks/M2Kit.xcframework/Info.plist b/Frameworks/M2Kit.xcframework/Info.plist index 72c6da7..9ddf4cd 100644 --- a/Frameworks/M2Kit.xcframework/Info.plist +++ b/Frameworks/M2Kit.xcframework/Info.plist @@ -18,23 +18,6 @@ SupportedPlatform ios - - BinaryPath - M2Kit.framework/Versions/A/M2Kit - LibraryIdentifier - ios-arm64_x86_64-maccatalyst - LibraryPath - M2Kit.framework - SupportedArchitectures - - arm64 - x86_64 - - SupportedPlatform - ios - SupportedPlatformVariant - maccatalyst - BinaryPath M2Kit.framework/M2Kit @@ -52,6 +35,23 @@ SupportedPlatformVariant simulator + + BinaryPath + M2Kit.framework/Versions/A/M2Kit + LibraryIdentifier + ios-arm64_x86_64-maccatalyst + LibraryPath + M2Kit.framework + SupportedArchitectures + + arm64 + x86_64 + + SupportedPlatform + ios + SupportedPlatformVariant + maccatalyst + CFBundlePackageType XFWK diff --git a/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Info.plist b/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Info.plist index a3f69b5..c9d09ca 100644 Binary files a/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Info.plist and b/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Info.plist differ diff --git a/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/M2Kit b/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/M2Kit index e0f0343..5218b65 100644 Binary files a/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/M2Kit and b/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/M2Kit differ diff --git a/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios.abi.json b/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios.abi.json index b6d74be..985cb9a 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios.abi.json +++ b/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios.abi.json @@ -32,6 +32,13 @@ "declKind": "Import", "moduleName": "M2Kit" }, + { + "kind": "Import", + "name": "Combine", + "printedName": "Combine", + "declKind": "Import", + "moduleName": "M2Kit" + }, { "kind": "Import", "name": "Foundation", @@ -13841,6 +13848,13 @@ "declKind": "Import", "moduleName": "M2Kit" }, + { + "kind": "Import", + "name": "Combine", + "printedName": "Combine", + "declKind": "Import", + "moduleName": "M2Kit" + }, { "kind": "TypeDecl", "name": "M2NetConnecttionType", @@ -14135,43 +14149,56 @@ "printedName": "M2NetMonitor", "children": [ { - "kind": "Function", - "name": "start", - "printedName": "start(monitorHandler:)", + "kind": "Var", + "name": "shared", + "printedName": "shared", "children": [ { "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - }, - { - "kind": "TypeFunc", - "name": "Function", - "printedName": "(Swift.Bool) -> ()", - "children": [ - { - "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - }, - { - "kind": "TypeNominal", - "name": "Bool", - "printedName": "Swift.Bool", - "usr": "s:Sb" - } - ] + "name": "M2NetMonitor", + "printedName": "M2Kit.M2NetMonitor", + "usr": "s:5M2Kit0A10NetMonitorC" } ], - "declKind": "Func", - "usr": "s:5M2Kit0A10NetMonitorV5start14monitorHandleryySbc_tF", - "mangledName": "$s5M2Kit0A10NetMonitorV5start14monitorHandleryySbc_tF", + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC6sharedACvpZ", + "mangledName": "$s5M2Kit0A10NetMonitorC6sharedACvpZ", "moduleName": "M2Kit", + "static": true, "declAttributes": [ + "HasInitialValue", + "Final", + "HasStorage", "Custom", "AccessControl" ], - "funcSelfKind": "NonMutating" + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "M2NetMonitor", + "printedName": "M2Kit.M2NetMonitor", + "usr": "s:5M2Kit0A10NetMonitorC" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC6sharedACvgZ", + "mangledName": "$s5M2Kit0A10NetMonitorC6sharedACvgZ", + "moduleName": "M2Kit", + "static": true, + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] }, { "kind": "Var", @@ -14186,12 +14213,16 @@ } ], "declKind": "Var", - "usr": "s:5M2Kit0A10NetMonitorV11isConnectedSbvp", - "mangledName": "$s5M2Kit0A10NetMonitorV11isConnectedSbvp", + "usr": "s:5M2Kit0A10NetMonitorC11isConnectedSbvp", + "mangledName": "$s5M2Kit0A10NetMonitorC11isConnectedSbvp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom" ], "accessors": [ { @@ -14207,9 +14238,59 @@ } ], "declKind": "Accessor", - "usr": "s:5M2Kit0A10NetMonitorV11isConnectedSbvg", - "mangledName": "$s5M2Kit0A10NetMonitorV11isConnectedSbvg", + "usr": "s:5M2Kit0A10NetMonitorC11isConnectedSbvg", + "mangledName": "$s5M2Kit0A10NetMonitorC11isConnectedSbvg", "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "$isConnected", + "printedName": "$isConnected", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], "accessorKind": "get" } ] @@ -14227,12 +14308,16 @@ } ], "declKind": "Var", - "usr": "s:5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovp", - "mangledName": "$s5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovp", + "usr": "s:5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovp", + "mangledName": "$s5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom" ], "accessors": [ { @@ -14248,44 +14333,193 @@ } ], "declKind": "Accessor", - "usr": "s:5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovg", - "mangledName": "$s5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovg", + "usr": "s:5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovg", + "mangledName": "$s5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovg", "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], "accessorKind": "get" } ] }, { - "kind": "Function", - "name": "stop", - "printedName": "stop()", + "kind": "Var", + "name": "$connectionType", + "printedName": "$connectionType", "children": [ { "kind": "TypeNominal", - "name": "Void", - "printedName": "()" + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" } ], - "declKind": "Func", - "usr": "s:5M2Kit0A10NetMonitorV4stopyyF", - "mangledName": "$s5M2Kit0A10NetMonitorV4stopyyF", + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "isReady", + "printedName": "isReady", + "children": [ + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC7isReadySbvp", + "mangledName": "$s5M2Kit0A10NetMonitorC7isReadySbvp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom", + "RawDocComment" ], - "funcSelfKind": "NonMutating" + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC7isReadySbvg", + "mangledName": "$s5M2Kit0A10NetMonitorC7isReadySbvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "$isReady", + "printedName": "$isReady", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] } ], - "declKind": "Struct", - "usr": "s:5M2Kit0A10NetMonitorV", - "mangledName": "$s5M2Kit0A10NetMonitorV", + "declKind": "Class", + "usr": "s:5M2Kit0A10NetMonitorC", + "mangledName": "$s5M2Kit0A10NetMonitorC", "moduleName": "M2Kit", "declAttributes": [ + "Final", "AccessControl", "Custom" ], + "hasMissingDesignatedInitializers": true, "conformances": [ + { + "kind": "Conformance", + "name": "ObservableObject", + "printedName": "ObservableObject", + "children": [ + { + "kind": "TypeWitness", + "name": "ObjectWillChangePublisher", + "printedName": "ObjectWillChangePublisher", + "children": [ + { + "kind": "TypeNominal", + "name": "ObservableObjectPublisher", + "printedName": "Combine.ObservableObjectPublisher", + "usr": "s:7Combine25ObservableObjectPublisherC" + } + ] + } + ], + "usr": "s:7Combine16ObservableObjectP", + "mangledName": "$s7Combine16ObservableObjectP" + }, { "kind": "Conformance", "name": "Copyable", @@ -21891,6 +22125,35 @@ ], "funcSelfKind": "NonMutating" }, + { + "kind": "Function", + "name": "enableWorkForInCellularNetwork", + "printedName": "enableWorkForInCellularNetwork(_:)", + "children": [ + { + "kind": "TypeNominal", + "name": "Void", + "printedName": "()" + }, + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Func", + "usr": "s:5M2Kit0A5UtilsV30enableWorkForInCellularNetworkyySbFZ", + "mangledName": "$s5M2Kit0A5UtilsV30enableWorkForInCellularNetworkyySbFZ", + "moduleName": "M2Kit", + "static": true, + "declAttributes": [ + "Custom", + "AccessControl", + "RawDocComment" + ], + "funcSelfKind": "NonMutating" + }, { "kind": "Var", "name": "countryCode", @@ -22908,15 +23171,15 @@ }, { "kind": "Import", - "name": "WebKit", - "printedName": "WebKit", + "name": "JavaScriptCore", + "printedName": "JavaScriptCore", "declKind": "Import", "moduleName": "M2Kit" }, { "kind": "Import", - "name": "JavaScriptCore", - "printedName": "JavaScriptCore", + "name": "M2KitMacros", + "printedName": "M2KitMacros", "declKind": "Import", "moduleName": "M2Kit" }, @@ -22929,15 +23192,15 @@ }, { "kind": "Import", - "name": "JavaScriptCore", - "printedName": "JavaScriptCore", + "name": "WebKit", + "printedName": "WebKit", "declKind": "Import", "moduleName": "M2Kit" }, { "kind": "Import", - "name": "M2KitMacros", - "printedName": "M2KitMacros", + "name": "JavaScriptCore", + "printedName": "JavaScriptCore", "declKind": "Import", "moduleName": "M2Kit" }, @@ -24881,77 +25144,77 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 258, + "offset": 256, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 277, + "offset": 275, "length": 1, "value": "8" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 296, + "offset": 294, "length": 2, "value": "16" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 318, + "offset": 316, "length": 2, "value": "24" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 337, + "offset": 335, "length": 2, "value": "32" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 359, + "offset": 357, "length": 2, "value": "40" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 379, + "offset": 377, "length": 2, "value": "48" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 399, + "offset": 397, "length": 2, "value": "56" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1065, + "offset": 1063, "length": 14, "value": "\"HH:mm:ss.SSS\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1262, + "offset": 1260, "length": 3, "value": "\" \"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1288, + "offset": 1286, "length": 4, "value": "\"\n\"" }, @@ -25595,7 +25858,14 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/NetMonitor.swift", "kind": "BooleanLiteral", - "offset": 345, + "offset": 413, + "length": 5, + "value": "false" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 467, "length": 5, "value": "false" }, @@ -26008,14 +26278,14 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/UserDefaultsWrapper.swift", "kind": "BooleanLiteral", - "offset": 1624, + "offset": 1631, "length": 5, "value": "false" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/UserDefaultsWrapper.swift", "kind": "BooleanLiteral", - "offset": 1843, + "offset": 1850, "length": 5, "value": "false" }, @@ -26033,73 +26303,87 @@ "length": 14, "value": "\".kBackupCode\"" }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", + "kind": "BooleanLiteral", + "offset": 399, + "length": 4, + "value": "true" + }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 381, + "offset": 327, + "length": 25, + "value": "\".kEnableWorkForCellular\"" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", + "kind": "StringLiteral", + "offset": 493, "length": 4, "value": "\"US\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 327, + "offset": 439, "length": 15, "value": "\".kCountryCode\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "IntegerLiteral", - "offset": 730, + "offset": 842, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 842, + "offset": 954, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "IntegerLiteral", - "offset": 1331, + "offset": 1443, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 1269, + "offset": 1381, "length": 22, "value": "\".kSavedCfgVersionKey\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 1368, + "offset": 1480, "length": 15, "value": "\".kSavedCfgKey\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 8267, + "offset": 8379, "length": 11, "value": "\"123aA@123\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils++V4.swift", "kind": "StringLiteral", - "offset": 150, + "offset": 153, "length": 12, "value": "\"image\/jpeg\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils++V4.swift", "kind": "StringLiteral", - "offset": 191, + "offset": 194, "length": 18, "value": "\"application\/json\"" }, @@ -26134,56 +26418,56 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 3766, + "offset": 3765, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "Dictionary", - "offset": 3951, + "offset": 3950, "length": 3, "value": "[]" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "Dictionary", - "offset": 4009, + "offset": 4008, "length": 3, "value": "[]" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5667, + "offset": 5666, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5750, + "offset": 5749, "length": 1, "value": "1" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5843, + "offset": 5842, "length": 1, "value": "2" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5948, + "offset": 5947, "length": 1, "value": "3" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 6042, + "offset": 6041, "length": 1, "value": "4" }, @@ -26192,7 +26476,7 @@ "kind": "StringLiteral", "offset": 131, "length": 6, - "value": "\"5.34\"" + "value": "\"5.35\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2IAP.swift", @@ -26278,6 +26562,20 @@ "length": 1, "value": "1" }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 392, + "length": 5, + "value": "false" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 578, + "length": 5, + "value": "false" + }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Setting.swift", "kind": "StringLiteral", @@ -26911,19 +27209,19 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Utils.swift", "kind": "StringLiteral", - "offset": 807, + "offset": 1112, "length": 16, "value": "\"workForChanged\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Utils.swift", "kind": "StringLiteral", - "offset": 934, + "offset": 1239, "length": 14, "value": "\"workForBegin\"" }, { - "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Radio\/MTWebpage.swift", + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Radio\/MyTunerWebPage.swift", "kind": "StringLiteral", "offset": 296, "length": 35, diff --git a/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios.private.swiftinterface b/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios.private.swiftinterface index c12fe93..25827ee 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios.private.swiftinterface +++ b/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios.private.swiftinterface @@ -537,15 +537,28 @@ public enum M2NetConnecttionType { get } } -@_Concurrency.MainActor public struct M2NetMonitor { - @_Concurrency.MainActor public func start(monitorHandler: @escaping (_ isConnected: Swift.Bool) -> Swift.Void) - @_Concurrency.MainActor public var isConnected: Swift.Bool { +@_hasMissingDesignatedInitializers @_Concurrency.MainActor final public class M2NetMonitor : Foundation.ObservableObject { + @_Concurrency.MainActor public static let shared: M2Kit.M2NetMonitor + @Combine.Published @_projectedValueProperty($isConnected) @_Concurrency.MainActor final public var isConnected: Swift.Bool { get } - @_Concurrency.MainActor public var connectionType: M2Kit.M2NetConnecttionType { + @_Concurrency.MainActor final public var $isConnected: Combine.Published.Publisher { get } - @_Concurrency.MainActor public func stop() + @Combine.Published @_projectedValueProperty($connectionType) @_Concurrency.MainActor final public var connectionType: M2Kit.M2NetConnecttionType { + get + } + @_Concurrency.MainActor final public var $connectionType: Combine.Published.Publisher { + get + } + @Combine.Published @_projectedValueProperty($isReady) @_Concurrency.MainActor final public var isReady: Swift.Bool { + get + } + @_Concurrency.MainActor final public var $isReady: Combine.Published.Publisher { + get + } + public typealias ObjectWillChangePublisher = Combine.ObservableObjectPublisher + @objc deinit } @_Concurrency.MainActor public struct M2Radio { } @@ -888,6 +901,7 @@ public enum M2VideoStatus { @_Concurrency.MainActor public static func checkStatus(trackID: Swift.String) -> M2Kit.M2VideoStatus @_Concurrency.MainActor public static func deleteDataOf(trackID: Swift.String) @_Concurrency.MainActor public static func filePathOf(trackID: Swift.String) -> Swift.String + @_Concurrency.MainActor public static func enableWorkForInCellularNetwork(_ enable: Swift.Bool) } extension M2Kit.M2Utils { @_Concurrency.MainActor public static var countryCode: Swift.String { diff --git a/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios.swiftinterface b/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios.swiftinterface index c12fe93..25827ee 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios.swiftinterface +++ b/Frameworks/M2Kit.xcframework/ios-arm64/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios.swiftinterface @@ -537,15 +537,28 @@ public enum M2NetConnecttionType { get } } -@_Concurrency.MainActor public struct M2NetMonitor { - @_Concurrency.MainActor public func start(monitorHandler: @escaping (_ isConnected: Swift.Bool) -> Swift.Void) - @_Concurrency.MainActor public var isConnected: Swift.Bool { +@_hasMissingDesignatedInitializers @_Concurrency.MainActor final public class M2NetMonitor : Foundation.ObservableObject { + @_Concurrency.MainActor public static let shared: M2Kit.M2NetMonitor + @Combine.Published @_projectedValueProperty($isConnected) @_Concurrency.MainActor final public var isConnected: Swift.Bool { get } - @_Concurrency.MainActor public var connectionType: M2Kit.M2NetConnecttionType { + @_Concurrency.MainActor final public var $isConnected: Combine.Published.Publisher { get } - @_Concurrency.MainActor public func stop() + @Combine.Published @_projectedValueProperty($connectionType) @_Concurrency.MainActor final public var connectionType: M2Kit.M2NetConnecttionType { + get + } + @_Concurrency.MainActor final public var $connectionType: Combine.Published.Publisher { + get + } + @Combine.Published @_projectedValueProperty($isReady) @_Concurrency.MainActor final public var isReady: Swift.Bool { + get + } + @_Concurrency.MainActor final public var $isReady: Combine.Published.Publisher { + get + } + public typealias ObjectWillChangePublisher = Combine.ObservableObjectPublisher + @objc deinit } @_Concurrency.MainActor public struct M2Radio { } @@ -888,6 +901,7 @@ public enum M2VideoStatus { @_Concurrency.MainActor public static func checkStatus(trackID: Swift.String) -> M2Kit.M2VideoStatus @_Concurrency.MainActor public static func deleteDataOf(trackID: Swift.String) @_Concurrency.MainActor public static func filePathOf(trackID: Swift.String) -> Swift.String + @_Concurrency.MainActor public static func enableWorkForInCellularNetwork(_ enable: Swift.Bool) } extension M2Kit.M2Utils { @_Concurrency.MainActor public static var countryCode: Swift.String { diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/M2Kit b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/M2Kit index 0be713a..ba28cea 100644 Binary files a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/M2Kit and b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/M2Kit differ diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/arm64-apple-ios-macabi.abi.json b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/arm64-apple-ios-macabi.abi.json index b6d74be..985cb9a 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/arm64-apple-ios-macabi.abi.json +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/arm64-apple-ios-macabi.abi.json @@ -32,6 +32,13 @@ "declKind": "Import", "moduleName": "M2Kit" }, + { + "kind": "Import", + "name": "Combine", + "printedName": "Combine", + "declKind": "Import", + "moduleName": "M2Kit" + }, { "kind": "Import", "name": "Foundation", @@ -13841,6 +13848,13 @@ "declKind": "Import", "moduleName": "M2Kit" }, + { + "kind": "Import", + "name": "Combine", + "printedName": "Combine", + "declKind": "Import", + "moduleName": "M2Kit" + }, { "kind": "TypeDecl", "name": "M2NetConnecttionType", @@ -14135,43 +14149,56 @@ "printedName": "M2NetMonitor", "children": [ { - "kind": "Function", - "name": "start", - "printedName": "start(monitorHandler:)", + "kind": "Var", + "name": "shared", + "printedName": "shared", "children": [ { "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - }, - { - "kind": "TypeFunc", - "name": "Function", - "printedName": "(Swift.Bool) -> ()", - "children": [ - { - "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - }, - { - "kind": "TypeNominal", - "name": "Bool", - "printedName": "Swift.Bool", - "usr": "s:Sb" - } - ] + "name": "M2NetMonitor", + "printedName": "M2Kit.M2NetMonitor", + "usr": "s:5M2Kit0A10NetMonitorC" } ], - "declKind": "Func", - "usr": "s:5M2Kit0A10NetMonitorV5start14monitorHandleryySbc_tF", - "mangledName": "$s5M2Kit0A10NetMonitorV5start14monitorHandleryySbc_tF", + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC6sharedACvpZ", + "mangledName": "$s5M2Kit0A10NetMonitorC6sharedACvpZ", "moduleName": "M2Kit", + "static": true, "declAttributes": [ + "HasInitialValue", + "Final", + "HasStorage", "Custom", "AccessControl" ], - "funcSelfKind": "NonMutating" + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "M2NetMonitor", + "printedName": "M2Kit.M2NetMonitor", + "usr": "s:5M2Kit0A10NetMonitorC" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC6sharedACvgZ", + "mangledName": "$s5M2Kit0A10NetMonitorC6sharedACvgZ", + "moduleName": "M2Kit", + "static": true, + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] }, { "kind": "Var", @@ -14186,12 +14213,16 @@ } ], "declKind": "Var", - "usr": "s:5M2Kit0A10NetMonitorV11isConnectedSbvp", - "mangledName": "$s5M2Kit0A10NetMonitorV11isConnectedSbvp", + "usr": "s:5M2Kit0A10NetMonitorC11isConnectedSbvp", + "mangledName": "$s5M2Kit0A10NetMonitorC11isConnectedSbvp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom" ], "accessors": [ { @@ -14207,9 +14238,59 @@ } ], "declKind": "Accessor", - "usr": "s:5M2Kit0A10NetMonitorV11isConnectedSbvg", - "mangledName": "$s5M2Kit0A10NetMonitorV11isConnectedSbvg", + "usr": "s:5M2Kit0A10NetMonitorC11isConnectedSbvg", + "mangledName": "$s5M2Kit0A10NetMonitorC11isConnectedSbvg", "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "$isConnected", + "printedName": "$isConnected", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], "accessorKind": "get" } ] @@ -14227,12 +14308,16 @@ } ], "declKind": "Var", - "usr": "s:5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovp", - "mangledName": "$s5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovp", + "usr": "s:5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovp", + "mangledName": "$s5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom" ], "accessors": [ { @@ -14248,44 +14333,193 @@ } ], "declKind": "Accessor", - "usr": "s:5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovg", - "mangledName": "$s5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovg", + "usr": "s:5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovg", + "mangledName": "$s5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovg", "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], "accessorKind": "get" } ] }, { - "kind": "Function", - "name": "stop", - "printedName": "stop()", + "kind": "Var", + "name": "$connectionType", + "printedName": "$connectionType", "children": [ { "kind": "TypeNominal", - "name": "Void", - "printedName": "()" + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" } ], - "declKind": "Func", - "usr": "s:5M2Kit0A10NetMonitorV4stopyyF", - "mangledName": "$s5M2Kit0A10NetMonitorV4stopyyF", + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "isReady", + "printedName": "isReady", + "children": [ + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC7isReadySbvp", + "mangledName": "$s5M2Kit0A10NetMonitorC7isReadySbvp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom", + "RawDocComment" ], - "funcSelfKind": "NonMutating" + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC7isReadySbvg", + "mangledName": "$s5M2Kit0A10NetMonitorC7isReadySbvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "$isReady", + "printedName": "$isReady", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] } ], - "declKind": "Struct", - "usr": "s:5M2Kit0A10NetMonitorV", - "mangledName": "$s5M2Kit0A10NetMonitorV", + "declKind": "Class", + "usr": "s:5M2Kit0A10NetMonitorC", + "mangledName": "$s5M2Kit0A10NetMonitorC", "moduleName": "M2Kit", "declAttributes": [ + "Final", "AccessControl", "Custom" ], + "hasMissingDesignatedInitializers": true, "conformances": [ + { + "kind": "Conformance", + "name": "ObservableObject", + "printedName": "ObservableObject", + "children": [ + { + "kind": "TypeWitness", + "name": "ObjectWillChangePublisher", + "printedName": "ObjectWillChangePublisher", + "children": [ + { + "kind": "TypeNominal", + "name": "ObservableObjectPublisher", + "printedName": "Combine.ObservableObjectPublisher", + "usr": "s:7Combine25ObservableObjectPublisherC" + } + ] + } + ], + "usr": "s:7Combine16ObservableObjectP", + "mangledName": "$s7Combine16ObservableObjectP" + }, { "kind": "Conformance", "name": "Copyable", @@ -21891,6 +22125,35 @@ ], "funcSelfKind": "NonMutating" }, + { + "kind": "Function", + "name": "enableWorkForInCellularNetwork", + "printedName": "enableWorkForInCellularNetwork(_:)", + "children": [ + { + "kind": "TypeNominal", + "name": "Void", + "printedName": "()" + }, + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Func", + "usr": "s:5M2Kit0A5UtilsV30enableWorkForInCellularNetworkyySbFZ", + "mangledName": "$s5M2Kit0A5UtilsV30enableWorkForInCellularNetworkyySbFZ", + "moduleName": "M2Kit", + "static": true, + "declAttributes": [ + "Custom", + "AccessControl", + "RawDocComment" + ], + "funcSelfKind": "NonMutating" + }, { "kind": "Var", "name": "countryCode", @@ -22908,15 +23171,15 @@ }, { "kind": "Import", - "name": "WebKit", - "printedName": "WebKit", + "name": "JavaScriptCore", + "printedName": "JavaScriptCore", "declKind": "Import", "moduleName": "M2Kit" }, { "kind": "Import", - "name": "JavaScriptCore", - "printedName": "JavaScriptCore", + "name": "M2KitMacros", + "printedName": "M2KitMacros", "declKind": "Import", "moduleName": "M2Kit" }, @@ -22929,15 +23192,15 @@ }, { "kind": "Import", - "name": "JavaScriptCore", - "printedName": "JavaScriptCore", + "name": "WebKit", + "printedName": "WebKit", "declKind": "Import", "moduleName": "M2Kit" }, { "kind": "Import", - "name": "M2KitMacros", - "printedName": "M2KitMacros", + "name": "JavaScriptCore", + "printedName": "JavaScriptCore", "declKind": "Import", "moduleName": "M2Kit" }, @@ -24881,77 +25144,77 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 258, + "offset": 256, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 277, + "offset": 275, "length": 1, "value": "8" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 296, + "offset": 294, "length": 2, "value": "16" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 318, + "offset": 316, "length": 2, "value": "24" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 337, + "offset": 335, "length": 2, "value": "32" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 359, + "offset": 357, "length": 2, "value": "40" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 379, + "offset": 377, "length": 2, "value": "48" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 399, + "offset": 397, "length": 2, "value": "56" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1065, + "offset": 1063, "length": 14, "value": "\"HH:mm:ss.SSS\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1262, + "offset": 1260, "length": 3, "value": "\" \"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1288, + "offset": 1286, "length": 4, "value": "\"\n\"" }, @@ -25595,7 +25858,14 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/NetMonitor.swift", "kind": "BooleanLiteral", - "offset": 345, + "offset": 413, + "length": 5, + "value": "false" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 467, "length": 5, "value": "false" }, @@ -26008,14 +26278,14 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/UserDefaultsWrapper.swift", "kind": "BooleanLiteral", - "offset": 1624, + "offset": 1631, "length": 5, "value": "false" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/UserDefaultsWrapper.swift", "kind": "BooleanLiteral", - "offset": 1843, + "offset": 1850, "length": 5, "value": "false" }, @@ -26033,73 +26303,87 @@ "length": 14, "value": "\".kBackupCode\"" }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", + "kind": "BooleanLiteral", + "offset": 399, + "length": 4, + "value": "true" + }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 381, + "offset": 327, + "length": 25, + "value": "\".kEnableWorkForCellular\"" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", + "kind": "StringLiteral", + "offset": 493, "length": 4, "value": "\"US\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 327, + "offset": 439, "length": 15, "value": "\".kCountryCode\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "IntegerLiteral", - "offset": 730, + "offset": 842, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 842, + "offset": 954, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "IntegerLiteral", - "offset": 1331, + "offset": 1443, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 1269, + "offset": 1381, "length": 22, "value": "\".kSavedCfgVersionKey\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 1368, + "offset": 1480, "length": 15, "value": "\".kSavedCfgKey\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 8267, + "offset": 8379, "length": 11, "value": "\"123aA@123\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils++V4.swift", "kind": "StringLiteral", - "offset": 150, + "offset": 153, "length": 12, "value": "\"image\/jpeg\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils++V4.swift", "kind": "StringLiteral", - "offset": 191, + "offset": 194, "length": 18, "value": "\"application\/json\"" }, @@ -26134,56 +26418,56 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 3766, + "offset": 3765, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "Dictionary", - "offset": 3951, + "offset": 3950, "length": 3, "value": "[]" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "Dictionary", - "offset": 4009, + "offset": 4008, "length": 3, "value": "[]" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5667, + "offset": 5666, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5750, + "offset": 5749, "length": 1, "value": "1" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5843, + "offset": 5842, "length": 1, "value": "2" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5948, + "offset": 5947, "length": 1, "value": "3" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 6042, + "offset": 6041, "length": 1, "value": "4" }, @@ -26192,7 +26476,7 @@ "kind": "StringLiteral", "offset": 131, "length": 6, - "value": "\"5.34\"" + "value": "\"5.35\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2IAP.swift", @@ -26278,6 +26562,20 @@ "length": 1, "value": "1" }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 392, + "length": 5, + "value": "false" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 578, + "length": 5, + "value": "false" + }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Setting.swift", "kind": "StringLiteral", @@ -26911,19 +27209,19 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Utils.swift", "kind": "StringLiteral", - "offset": 807, + "offset": 1112, "length": 16, "value": "\"workForChanged\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Utils.swift", "kind": "StringLiteral", - "offset": 934, + "offset": 1239, "length": 14, "value": "\"workForBegin\"" }, { - "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Radio\/MTWebpage.swift", + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Radio\/MyTunerWebPage.swift", "kind": "StringLiteral", "offset": 296, "length": 35, diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/arm64-apple-ios-macabi.private.swiftinterface b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/arm64-apple-ios-macabi.private.swiftinterface index 47f7a81..cdddb67 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/arm64-apple-ios-macabi.private.swiftinterface +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/arm64-apple-ios-macabi.private.swiftinterface @@ -537,15 +537,28 @@ public enum M2NetConnecttionType { get } } -@_Concurrency.MainActor public struct M2NetMonitor { - @_Concurrency.MainActor public func start(monitorHandler: @escaping (_ isConnected: Swift.Bool) -> Swift.Void) - @_Concurrency.MainActor public var isConnected: Swift.Bool { +@_hasMissingDesignatedInitializers @_Concurrency.MainActor final public class M2NetMonitor : Foundation.ObservableObject { + @_Concurrency.MainActor public static let shared: M2Kit.M2NetMonitor + @Combine.Published @_projectedValueProperty($isConnected) @_Concurrency.MainActor final public var isConnected: Swift.Bool { get } - @_Concurrency.MainActor public var connectionType: M2Kit.M2NetConnecttionType { + @_Concurrency.MainActor final public var $isConnected: Combine.Published.Publisher { get } - @_Concurrency.MainActor public func stop() + @Combine.Published @_projectedValueProperty($connectionType) @_Concurrency.MainActor final public var connectionType: M2Kit.M2NetConnecttionType { + get + } + @_Concurrency.MainActor final public var $connectionType: Combine.Published.Publisher { + get + } + @Combine.Published @_projectedValueProperty($isReady) @_Concurrency.MainActor final public var isReady: Swift.Bool { + get + } + @_Concurrency.MainActor final public var $isReady: Combine.Published.Publisher { + get + } + public typealias ObjectWillChangePublisher = Combine.ObservableObjectPublisher + @objc deinit } @_Concurrency.MainActor public struct M2Radio { } @@ -888,6 +901,7 @@ public enum M2VideoStatus { @_Concurrency.MainActor public static func checkStatus(trackID: Swift.String) -> M2Kit.M2VideoStatus @_Concurrency.MainActor public static func deleteDataOf(trackID: Swift.String) @_Concurrency.MainActor public static func filePathOf(trackID: Swift.String) -> Swift.String + @_Concurrency.MainActor public static func enableWorkForInCellularNetwork(_ enable: Swift.Bool) } extension M2Kit.M2Utils { @_Concurrency.MainActor public static var countryCode: Swift.String { diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/arm64-apple-ios-macabi.swiftinterface b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/arm64-apple-ios-macabi.swiftinterface index 47f7a81..cdddb67 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/arm64-apple-ios-macabi.swiftinterface +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/arm64-apple-ios-macabi.swiftinterface @@ -537,15 +537,28 @@ public enum M2NetConnecttionType { get } } -@_Concurrency.MainActor public struct M2NetMonitor { - @_Concurrency.MainActor public func start(monitorHandler: @escaping (_ isConnected: Swift.Bool) -> Swift.Void) - @_Concurrency.MainActor public var isConnected: Swift.Bool { +@_hasMissingDesignatedInitializers @_Concurrency.MainActor final public class M2NetMonitor : Foundation.ObservableObject { + @_Concurrency.MainActor public static let shared: M2Kit.M2NetMonitor + @Combine.Published @_projectedValueProperty($isConnected) @_Concurrency.MainActor final public var isConnected: Swift.Bool { get } - @_Concurrency.MainActor public var connectionType: M2Kit.M2NetConnecttionType { + @_Concurrency.MainActor final public var $isConnected: Combine.Published.Publisher { get } - @_Concurrency.MainActor public func stop() + @Combine.Published @_projectedValueProperty($connectionType) @_Concurrency.MainActor final public var connectionType: M2Kit.M2NetConnecttionType { + get + } + @_Concurrency.MainActor final public var $connectionType: Combine.Published.Publisher { + get + } + @Combine.Published @_projectedValueProperty($isReady) @_Concurrency.MainActor final public var isReady: Swift.Bool { + get + } + @_Concurrency.MainActor final public var $isReady: Combine.Published.Publisher { + get + } + public typealias ObjectWillChangePublisher = Combine.ObservableObjectPublisher + @objc deinit } @_Concurrency.MainActor public struct M2Radio { } @@ -888,6 +901,7 @@ public enum M2VideoStatus { @_Concurrency.MainActor public static func checkStatus(trackID: Swift.String) -> M2Kit.M2VideoStatus @_Concurrency.MainActor public static func deleteDataOf(trackID: Swift.String) @_Concurrency.MainActor public static func filePathOf(trackID: Swift.String) -> Swift.String + @_Concurrency.MainActor public static func enableWorkForInCellularNetwork(_ enable: Swift.Bool) } extension M2Kit.M2Utils { @_Concurrency.MainActor public static var countryCode: Swift.String { diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/x86_64-apple-ios-macabi.abi.json b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/x86_64-apple-ios-macabi.abi.json index b6d74be..985cb9a 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/x86_64-apple-ios-macabi.abi.json +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/x86_64-apple-ios-macabi.abi.json @@ -32,6 +32,13 @@ "declKind": "Import", "moduleName": "M2Kit" }, + { + "kind": "Import", + "name": "Combine", + "printedName": "Combine", + "declKind": "Import", + "moduleName": "M2Kit" + }, { "kind": "Import", "name": "Foundation", @@ -13841,6 +13848,13 @@ "declKind": "Import", "moduleName": "M2Kit" }, + { + "kind": "Import", + "name": "Combine", + "printedName": "Combine", + "declKind": "Import", + "moduleName": "M2Kit" + }, { "kind": "TypeDecl", "name": "M2NetConnecttionType", @@ -14135,43 +14149,56 @@ "printedName": "M2NetMonitor", "children": [ { - "kind": "Function", - "name": "start", - "printedName": "start(monitorHandler:)", + "kind": "Var", + "name": "shared", + "printedName": "shared", "children": [ { "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - }, - { - "kind": "TypeFunc", - "name": "Function", - "printedName": "(Swift.Bool) -> ()", - "children": [ - { - "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - }, - { - "kind": "TypeNominal", - "name": "Bool", - "printedName": "Swift.Bool", - "usr": "s:Sb" - } - ] + "name": "M2NetMonitor", + "printedName": "M2Kit.M2NetMonitor", + "usr": "s:5M2Kit0A10NetMonitorC" } ], - "declKind": "Func", - "usr": "s:5M2Kit0A10NetMonitorV5start14monitorHandleryySbc_tF", - "mangledName": "$s5M2Kit0A10NetMonitorV5start14monitorHandleryySbc_tF", + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC6sharedACvpZ", + "mangledName": "$s5M2Kit0A10NetMonitorC6sharedACvpZ", "moduleName": "M2Kit", + "static": true, "declAttributes": [ + "HasInitialValue", + "Final", + "HasStorage", "Custom", "AccessControl" ], - "funcSelfKind": "NonMutating" + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "M2NetMonitor", + "printedName": "M2Kit.M2NetMonitor", + "usr": "s:5M2Kit0A10NetMonitorC" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC6sharedACvgZ", + "mangledName": "$s5M2Kit0A10NetMonitorC6sharedACvgZ", + "moduleName": "M2Kit", + "static": true, + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] }, { "kind": "Var", @@ -14186,12 +14213,16 @@ } ], "declKind": "Var", - "usr": "s:5M2Kit0A10NetMonitorV11isConnectedSbvp", - "mangledName": "$s5M2Kit0A10NetMonitorV11isConnectedSbvp", + "usr": "s:5M2Kit0A10NetMonitorC11isConnectedSbvp", + "mangledName": "$s5M2Kit0A10NetMonitorC11isConnectedSbvp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom" ], "accessors": [ { @@ -14207,9 +14238,59 @@ } ], "declKind": "Accessor", - "usr": "s:5M2Kit0A10NetMonitorV11isConnectedSbvg", - "mangledName": "$s5M2Kit0A10NetMonitorV11isConnectedSbvg", + "usr": "s:5M2Kit0A10NetMonitorC11isConnectedSbvg", + "mangledName": "$s5M2Kit0A10NetMonitorC11isConnectedSbvg", "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "$isConnected", + "printedName": "$isConnected", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], "accessorKind": "get" } ] @@ -14227,12 +14308,16 @@ } ], "declKind": "Var", - "usr": "s:5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovp", - "mangledName": "$s5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovp", + "usr": "s:5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovp", + "mangledName": "$s5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom" ], "accessors": [ { @@ -14248,44 +14333,193 @@ } ], "declKind": "Accessor", - "usr": "s:5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovg", - "mangledName": "$s5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovg", + "usr": "s:5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovg", + "mangledName": "$s5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovg", "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], "accessorKind": "get" } ] }, { - "kind": "Function", - "name": "stop", - "printedName": "stop()", + "kind": "Var", + "name": "$connectionType", + "printedName": "$connectionType", "children": [ { "kind": "TypeNominal", - "name": "Void", - "printedName": "()" + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" } ], - "declKind": "Func", - "usr": "s:5M2Kit0A10NetMonitorV4stopyyF", - "mangledName": "$s5M2Kit0A10NetMonitorV4stopyyF", + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "isReady", + "printedName": "isReady", + "children": [ + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC7isReadySbvp", + "mangledName": "$s5M2Kit0A10NetMonitorC7isReadySbvp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom", + "RawDocComment" ], - "funcSelfKind": "NonMutating" + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC7isReadySbvg", + "mangledName": "$s5M2Kit0A10NetMonitorC7isReadySbvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "$isReady", + "printedName": "$isReady", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] } ], - "declKind": "Struct", - "usr": "s:5M2Kit0A10NetMonitorV", - "mangledName": "$s5M2Kit0A10NetMonitorV", + "declKind": "Class", + "usr": "s:5M2Kit0A10NetMonitorC", + "mangledName": "$s5M2Kit0A10NetMonitorC", "moduleName": "M2Kit", "declAttributes": [ + "Final", "AccessControl", "Custom" ], + "hasMissingDesignatedInitializers": true, "conformances": [ + { + "kind": "Conformance", + "name": "ObservableObject", + "printedName": "ObservableObject", + "children": [ + { + "kind": "TypeWitness", + "name": "ObjectWillChangePublisher", + "printedName": "ObjectWillChangePublisher", + "children": [ + { + "kind": "TypeNominal", + "name": "ObservableObjectPublisher", + "printedName": "Combine.ObservableObjectPublisher", + "usr": "s:7Combine25ObservableObjectPublisherC" + } + ] + } + ], + "usr": "s:7Combine16ObservableObjectP", + "mangledName": "$s7Combine16ObservableObjectP" + }, { "kind": "Conformance", "name": "Copyable", @@ -21891,6 +22125,35 @@ ], "funcSelfKind": "NonMutating" }, + { + "kind": "Function", + "name": "enableWorkForInCellularNetwork", + "printedName": "enableWorkForInCellularNetwork(_:)", + "children": [ + { + "kind": "TypeNominal", + "name": "Void", + "printedName": "()" + }, + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Func", + "usr": "s:5M2Kit0A5UtilsV30enableWorkForInCellularNetworkyySbFZ", + "mangledName": "$s5M2Kit0A5UtilsV30enableWorkForInCellularNetworkyySbFZ", + "moduleName": "M2Kit", + "static": true, + "declAttributes": [ + "Custom", + "AccessControl", + "RawDocComment" + ], + "funcSelfKind": "NonMutating" + }, { "kind": "Var", "name": "countryCode", @@ -22908,15 +23171,15 @@ }, { "kind": "Import", - "name": "WebKit", - "printedName": "WebKit", + "name": "JavaScriptCore", + "printedName": "JavaScriptCore", "declKind": "Import", "moduleName": "M2Kit" }, { "kind": "Import", - "name": "JavaScriptCore", - "printedName": "JavaScriptCore", + "name": "M2KitMacros", + "printedName": "M2KitMacros", "declKind": "Import", "moduleName": "M2Kit" }, @@ -22929,15 +23192,15 @@ }, { "kind": "Import", - "name": "JavaScriptCore", - "printedName": "JavaScriptCore", + "name": "WebKit", + "printedName": "WebKit", "declKind": "Import", "moduleName": "M2Kit" }, { "kind": "Import", - "name": "M2KitMacros", - "printedName": "M2KitMacros", + "name": "JavaScriptCore", + "printedName": "JavaScriptCore", "declKind": "Import", "moduleName": "M2Kit" }, @@ -24881,77 +25144,77 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 258, + "offset": 256, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 277, + "offset": 275, "length": 1, "value": "8" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 296, + "offset": 294, "length": 2, "value": "16" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 318, + "offset": 316, "length": 2, "value": "24" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 337, + "offset": 335, "length": 2, "value": "32" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 359, + "offset": 357, "length": 2, "value": "40" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 379, + "offset": 377, "length": 2, "value": "48" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 399, + "offset": 397, "length": 2, "value": "56" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1065, + "offset": 1063, "length": 14, "value": "\"HH:mm:ss.SSS\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1262, + "offset": 1260, "length": 3, "value": "\" \"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1288, + "offset": 1286, "length": 4, "value": "\"\n\"" }, @@ -25595,7 +25858,14 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/NetMonitor.swift", "kind": "BooleanLiteral", - "offset": 345, + "offset": 413, + "length": 5, + "value": "false" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 467, "length": 5, "value": "false" }, @@ -26008,14 +26278,14 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/UserDefaultsWrapper.swift", "kind": "BooleanLiteral", - "offset": 1624, + "offset": 1631, "length": 5, "value": "false" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/UserDefaultsWrapper.swift", "kind": "BooleanLiteral", - "offset": 1843, + "offset": 1850, "length": 5, "value": "false" }, @@ -26033,73 +26303,87 @@ "length": 14, "value": "\".kBackupCode\"" }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", + "kind": "BooleanLiteral", + "offset": 399, + "length": 4, + "value": "true" + }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 381, + "offset": 327, + "length": 25, + "value": "\".kEnableWorkForCellular\"" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", + "kind": "StringLiteral", + "offset": 493, "length": 4, "value": "\"US\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 327, + "offset": 439, "length": 15, "value": "\".kCountryCode\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "IntegerLiteral", - "offset": 730, + "offset": 842, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 842, + "offset": 954, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "IntegerLiteral", - "offset": 1331, + "offset": 1443, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 1269, + "offset": 1381, "length": 22, "value": "\".kSavedCfgVersionKey\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 1368, + "offset": 1480, "length": 15, "value": "\".kSavedCfgKey\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 8267, + "offset": 8379, "length": 11, "value": "\"123aA@123\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils++V4.swift", "kind": "StringLiteral", - "offset": 150, + "offset": 153, "length": 12, "value": "\"image\/jpeg\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils++V4.swift", "kind": "StringLiteral", - "offset": 191, + "offset": 194, "length": 18, "value": "\"application\/json\"" }, @@ -26134,56 +26418,56 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 3766, + "offset": 3765, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "Dictionary", - "offset": 3951, + "offset": 3950, "length": 3, "value": "[]" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "Dictionary", - "offset": 4009, + "offset": 4008, "length": 3, "value": "[]" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5667, + "offset": 5666, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5750, + "offset": 5749, "length": 1, "value": "1" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5843, + "offset": 5842, "length": 1, "value": "2" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5948, + "offset": 5947, "length": 1, "value": "3" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 6042, + "offset": 6041, "length": 1, "value": "4" }, @@ -26192,7 +26476,7 @@ "kind": "StringLiteral", "offset": 131, "length": 6, - "value": "\"5.34\"" + "value": "\"5.35\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2IAP.swift", @@ -26278,6 +26562,20 @@ "length": 1, "value": "1" }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 392, + "length": 5, + "value": "false" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 578, + "length": 5, + "value": "false" + }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Setting.swift", "kind": "StringLiteral", @@ -26911,19 +27209,19 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Utils.swift", "kind": "StringLiteral", - "offset": 807, + "offset": 1112, "length": 16, "value": "\"workForChanged\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Utils.swift", "kind": "StringLiteral", - "offset": 934, + "offset": 1239, "length": 14, "value": "\"workForBegin\"" }, { - "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Radio\/MTWebpage.swift", + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Radio\/MyTunerWebPage.swift", "kind": "StringLiteral", "offset": 296, "length": 35, diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/x86_64-apple-ios-macabi.private.swiftinterface b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/x86_64-apple-ios-macabi.private.swiftinterface index 15b1992..3d1bf11 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/x86_64-apple-ios-macabi.private.swiftinterface +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/x86_64-apple-ios-macabi.private.swiftinterface @@ -537,15 +537,28 @@ public enum M2NetConnecttionType { get } } -@_Concurrency.MainActor public struct M2NetMonitor { - @_Concurrency.MainActor public func start(monitorHandler: @escaping (_ isConnected: Swift.Bool) -> Swift.Void) - @_Concurrency.MainActor public var isConnected: Swift.Bool { +@_hasMissingDesignatedInitializers @_Concurrency.MainActor final public class M2NetMonitor : Foundation.ObservableObject { + @_Concurrency.MainActor public static let shared: M2Kit.M2NetMonitor + @Combine.Published @_projectedValueProperty($isConnected) @_Concurrency.MainActor final public var isConnected: Swift.Bool { get } - @_Concurrency.MainActor public var connectionType: M2Kit.M2NetConnecttionType { + @_Concurrency.MainActor final public var $isConnected: Combine.Published.Publisher { get } - @_Concurrency.MainActor public func stop() + @Combine.Published @_projectedValueProperty($connectionType) @_Concurrency.MainActor final public var connectionType: M2Kit.M2NetConnecttionType { + get + } + @_Concurrency.MainActor final public var $connectionType: Combine.Published.Publisher { + get + } + @Combine.Published @_projectedValueProperty($isReady) @_Concurrency.MainActor final public var isReady: Swift.Bool { + get + } + @_Concurrency.MainActor final public var $isReady: Combine.Published.Publisher { + get + } + public typealias ObjectWillChangePublisher = Combine.ObservableObjectPublisher + @objc deinit } @_Concurrency.MainActor public struct M2Radio { } @@ -888,6 +901,7 @@ public enum M2VideoStatus { @_Concurrency.MainActor public static func checkStatus(trackID: Swift.String) -> M2Kit.M2VideoStatus @_Concurrency.MainActor public static func deleteDataOf(trackID: Swift.String) @_Concurrency.MainActor public static func filePathOf(trackID: Swift.String) -> Swift.String + @_Concurrency.MainActor public static func enableWorkForInCellularNetwork(_ enable: Swift.Bool) } extension M2Kit.M2Utils { @_Concurrency.MainActor public static var countryCode: Swift.String { diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/x86_64-apple-ios-macabi.swiftinterface b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/x86_64-apple-ios-macabi.swiftinterface index 15b1992..3d1bf11 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/x86_64-apple-ios-macabi.swiftinterface +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Modules/M2Kit.swiftmodule/x86_64-apple-ios-macabi.swiftinterface @@ -537,15 +537,28 @@ public enum M2NetConnecttionType { get } } -@_Concurrency.MainActor public struct M2NetMonitor { - @_Concurrency.MainActor public func start(monitorHandler: @escaping (_ isConnected: Swift.Bool) -> Swift.Void) - @_Concurrency.MainActor public var isConnected: Swift.Bool { +@_hasMissingDesignatedInitializers @_Concurrency.MainActor final public class M2NetMonitor : Foundation.ObservableObject { + @_Concurrency.MainActor public static let shared: M2Kit.M2NetMonitor + @Combine.Published @_projectedValueProperty($isConnected) @_Concurrency.MainActor final public var isConnected: Swift.Bool { get } - @_Concurrency.MainActor public var connectionType: M2Kit.M2NetConnecttionType { + @_Concurrency.MainActor final public var $isConnected: Combine.Published.Publisher { get } - @_Concurrency.MainActor public func stop() + @Combine.Published @_projectedValueProperty($connectionType) @_Concurrency.MainActor final public var connectionType: M2Kit.M2NetConnecttionType { + get + } + @_Concurrency.MainActor final public var $connectionType: Combine.Published.Publisher { + get + } + @Combine.Published @_projectedValueProperty($isReady) @_Concurrency.MainActor final public var isReady: Swift.Bool { + get + } + @_Concurrency.MainActor final public var $isReady: Combine.Published.Publisher { + get + } + public typealias ObjectWillChangePublisher = Combine.ObservableObjectPublisher + @objc deinit } @_Concurrency.MainActor public struct M2Radio { } @@ -888,6 +901,7 @@ public enum M2VideoStatus { @_Concurrency.MainActor public static func checkStatus(trackID: Swift.String) -> M2Kit.M2VideoStatus @_Concurrency.MainActor public static func deleteDataOf(trackID: Swift.String) @_Concurrency.MainActor public static func filePathOf(trackID: Swift.String) -> Swift.String + @_Concurrency.MainActor public static func enableWorkForInCellularNetwork(_ enable: Swift.Bool) } extension M2Kit.M2Utils { @_Concurrency.MainActor public static var countryCode: Swift.String { diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Resources/Info.plist b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Resources/Info.plist index e5cd47e..acd0e75 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Resources/Info.plist +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-maccatalyst/M2Kit.framework/Versions/A/Resources/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 5.34 + 5.35 CFBundleSupportedPlatforms MacOSX diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Info.plist b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Info.plist index 36c9796..ca07741 100644 Binary files a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Info.plist and b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Info.plist differ diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/M2Kit b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/M2Kit index 04629a9..131c5f2 100644 Binary files a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/M2Kit and b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/M2Kit differ diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.abi.json b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.abi.json index b6d74be..985cb9a 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.abi.json +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.abi.json @@ -32,6 +32,13 @@ "declKind": "Import", "moduleName": "M2Kit" }, + { + "kind": "Import", + "name": "Combine", + "printedName": "Combine", + "declKind": "Import", + "moduleName": "M2Kit" + }, { "kind": "Import", "name": "Foundation", @@ -13841,6 +13848,13 @@ "declKind": "Import", "moduleName": "M2Kit" }, + { + "kind": "Import", + "name": "Combine", + "printedName": "Combine", + "declKind": "Import", + "moduleName": "M2Kit" + }, { "kind": "TypeDecl", "name": "M2NetConnecttionType", @@ -14135,43 +14149,56 @@ "printedName": "M2NetMonitor", "children": [ { - "kind": "Function", - "name": "start", - "printedName": "start(monitorHandler:)", + "kind": "Var", + "name": "shared", + "printedName": "shared", "children": [ { "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - }, - { - "kind": "TypeFunc", - "name": "Function", - "printedName": "(Swift.Bool) -> ()", - "children": [ - { - "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - }, - { - "kind": "TypeNominal", - "name": "Bool", - "printedName": "Swift.Bool", - "usr": "s:Sb" - } - ] + "name": "M2NetMonitor", + "printedName": "M2Kit.M2NetMonitor", + "usr": "s:5M2Kit0A10NetMonitorC" } ], - "declKind": "Func", - "usr": "s:5M2Kit0A10NetMonitorV5start14monitorHandleryySbc_tF", - "mangledName": "$s5M2Kit0A10NetMonitorV5start14monitorHandleryySbc_tF", + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC6sharedACvpZ", + "mangledName": "$s5M2Kit0A10NetMonitorC6sharedACvpZ", "moduleName": "M2Kit", + "static": true, "declAttributes": [ + "HasInitialValue", + "Final", + "HasStorage", "Custom", "AccessControl" ], - "funcSelfKind": "NonMutating" + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "M2NetMonitor", + "printedName": "M2Kit.M2NetMonitor", + "usr": "s:5M2Kit0A10NetMonitorC" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC6sharedACvgZ", + "mangledName": "$s5M2Kit0A10NetMonitorC6sharedACvgZ", + "moduleName": "M2Kit", + "static": true, + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] }, { "kind": "Var", @@ -14186,12 +14213,16 @@ } ], "declKind": "Var", - "usr": "s:5M2Kit0A10NetMonitorV11isConnectedSbvp", - "mangledName": "$s5M2Kit0A10NetMonitorV11isConnectedSbvp", + "usr": "s:5M2Kit0A10NetMonitorC11isConnectedSbvp", + "mangledName": "$s5M2Kit0A10NetMonitorC11isConnectedSbvp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom" ], "accessors": [ { @@ -14207,9 +14238,59 @@ } ], "declKind": "Accessor", - "usr": "s:5M2Kit0A10NetMonitorV11isConnectedSbvg", - "mangledName": "$s5M2Kit0A10NetMonitorV11isConnectedSbvg", + "usr": "s:5M2Kit0A10NetMonitorC11isConnectedSbvg", + "mangledName": "$s5M2Kit0A10NetMonitorC11isConnectedSbvg", "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "$isConnected", + "printedName": "$isConnected", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], "accessorKind": "get" } ] @@ -14227,12 +14308,16 @@ } ], "declKind": "Var", - "usr": "s:5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovp", - "mangledName": "$s5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovp", + "usr": "s:5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovp", + "mangledName": "$s5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom" ], "accessors": [ { @@ -14248,44 +14333,193 @@ } ], "declKind": "Accessor", - "usr": "s:5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovg", - "mangledName": "$s5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovg", + "usr": "s:5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovg", + "mangledName": "$s5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovg", "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], "accessorKind": "get" } ] }, { - "kind": "Function", - "name": "stop", - "printedName": "stop()", + "kind": "Var", + "name": "$connectionType", + "printedName": "$connectionType", "children": [ { "kind": "TypeNominal", - "name": "Void", - "printedName": "()" + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" } ], - "declKind": "Func", - "usr": "s:5M2Kit0A10NetMonitorV4stopyyF", - "mangledName": "$s5M2Kit0A10NetMonitorV4stopyyF", + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "isReady", + "printedName": "isReady", + "children": [ + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC7isReadySbvp", + "mangledName": "$s5M2Kit0A10NetMonitorC7isReadySbvp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom", + "RawDocComment" ], - "funcSelfKind": "NonMutating" + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC7isReadySbvg", + "mangledName": "$s5M2Kit0A10NetMonitorC7isReadySbvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "$isReady", + "printedName": "$isReady", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] } ], - "declKind": "Struct", - "usr": "s:5M2Kit0A10NetMonitorV", - "mangledName": "$s5M2Kit0A10NetMonitorV", + "declKind": "Class", + "usr": "s:5M2Kit0A10NetMonitorC", + "mangledName": "$s5M2Kit0A10NetMonitorC", "moduleName": "M2Kit", "declAttributes": [ + "Final", "AccessControl", "Custom" ], + "hasMissingDesignatedInitializers": true, "conformances": [ + { + "kind": "Conformance", + "name": "ObservableObject", + "printedName": "ObservableObject", + "children": [ + { + "kind": "TypeWitness", + "name": "ObjectWillChangePublisher", + "printedName": "ObjectWillChangePublisher", + "children": [ + { + "kind": "TypeNominal", + "name": "ObservableObjectPublisher", + "printedName": "Combine.ObservableObjectPublisher", + "usr": "s:7Combine25ObservableObjectPublisherC" + } + ] + } + ], + "usr": "s:7Combine16ObservableObjectP", + "mangledName": "$s7Combine16ObservableObjectP" + }, { "kind": "Conformance", "name": "Copyable", @@ -21891,6 +22125,35 @@ ], "funcSelfKind": "NonMutating" }, + { + "kind": "Function", + "name": "enableWorkForInCellularNetwork", + "printedName": "enableWorkForInCellularNetwork(_:)", + "children": [ + { + "kind": "TypeNominal", + "name": "Void", + "printedName": "()" + }, + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Func", + "usr": "s:5M2Kit0A5UtilsV30enableWorkForInCellularNetworkyySbFZ", + "mangledName": "$s5M2Kit0A5UtilsV30enableWorkForInCellularNetworkyySbFZ", + "moduleName": "M2Kit", + "static": true, + "declAttributes": [ + "Custom", + "AccessControl", + "RawDocComment" + ], + "funcSelfKind": "NonMutating" + }, { "kind": "Var", "name": "countryCode", @@ -22908,15 +23171,15 @@ }, { "kind": "Import", - "name": "WebKit", - "printedName": "WebKit", + "name": "JavaScriptCore", + "printedName": "JavaScriptCore", "declKind": "Import", "moduleName": "M2Kit" }, { "kind": "Import", - "name": "JavaScriptCore", - "printedName": "JavaScriptCore", + "name": "M2KitMacros", + "printedName": "M2KitMacros", "declKind": "Import", "moduleName": "M2Kit" }, @@ -22929,15 +23192,15 @@ }, { "kind": "Import", - "name": "JavaScriptCore", - "printedName": "JavaScriptCore", + "name": "WebKit", + "printedName": "WebKit", "declKind": "Import", "moduleName": "M2Kit" }, { "kind": "Import", - "name": "M2KitMacros", - "printedName": "M2KitMacros", + "name": "JavaScriptCore", + "printedName": "JavaScriptCore", "declKind": "Import", "moduleName": "M2Kit" }, @@ -24881,77 +25144,77 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 258, + "offset": 256, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 277, + "offset": 275, "length": 1, "value": "8" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 296, + "offset": 294, "length": 2, "value": "16" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 318, + "offset": 316, "length": 2, "value": "24" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 337, + "offset": 335, "length": 2, "value": "32" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 359, + "offset": 357, "length": 2, "value": "40" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 379, + "offset": 377, "length": 2, "value": "48" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 399, + "offset": 397, "length": 2, "value": "56" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1065, + "offset": 1063, "length": 14, "value": "\"HH:mm:ss.SSS\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1262, + "offset": 1260, "length": 3, "value": "\" \"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1288, + "offset": 1286, "length": 4, "value": "\"\n\"" }, @@ -25595,7 +25858,14 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/NetMonitor.swift", "kind": "BooleanLiteral", - "offset": 345, + "offset": 413, + "length": 5, + "value": "false" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 467, "length": 5, "value": "false" }, @@ -26008,14 +26278,14 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/UserDefaultsWrapper.swift", "kind": "BooleanLiteral", - "offset": 1624, + "offset": 1631, "length": 5, "value": "false" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/UserDefaultsWrapper.swift", "kind": "BooleanLiteral", - "offset": 1843, + "offset": 1850, "length": 5, "value": "false" }, @@ -26033,73 +26303,87 @@ "length": 14, "value": "\".kBackupCode\"" }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", + "kind": "BooleanLiteral", + "offset": 399, + "length": 4, + "value": "true" + }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 381, + "offset": 327, + "length": 25, + "value": "\".kEnableWorkForCellular\"" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", + "kind": "StringLiteral", + "offset": 493, "length": 4, "value": "\"US\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 327, + "offset": 439, "length": 15, "value": "\".kCountryCode\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "IntegerLiteral", - "offset": 730, + "offset": 842, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 842, + "offset": 954, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "IntegerLiteral", - "offset": 1331, + "offset": 1443, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 1269, + "offset": 1381, "length": 22, "value": "\".kSavedCfgVersionKey\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 1368, + "offset": 1480, "length": 15, "value": "\".kSavedCfgKey\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 8267, + "offset": 8379, "length": 11, "value": "\"123aA@123\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils++V4.swift", "kind": "StringLiteral", - "offset": 150, + "offset": 153, "length": 12, "value": "\"image\/jpeg\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils++V4.swift", "kind": "StringLiteral", - "offset": 191, + "offset": 194, "length": 18, "value": "\"application\/json\"" }, @@ -26134,56 +26418,56 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 3766, + "offset": 3765, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "Dictionary", - "offset": 3951, + "offset": 3950, "length": 3, "value": "[]" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "Dictionary", - "offset": 4009, + "offset": 4008, "length": 3, "value": "[]" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5667, + "offset": 5666, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5750, + "offset": 5749, "length": 1, "value": "1" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5843, + "offset": 5842, "length": 1, "value": "2" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5948, + "offset": 5947, "length": 1, "value": "3" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 6042, + "offset": 6041, "length": 1, "value": "4" }, @@ -26192,7 +26476,7 @@ "kind": "StringLiteral", "offset": 131, "length": 6, - "value": "\"5.34\"" + "value": "\"5.35\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2IAP.swift", @@ -26278,6 +26562,20 @@ "length": 1, "value": "1" }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 392, + "length": 5, + "value": "false" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 578, + "length": 5, + "value": "false" + }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Setting.swift", "kind": "StringLiteral", @@ -26911,19 +27209,19 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Utils.swift", "kind": "StringLiteral", - "offset": 807, + "offset": 1112, "length": 16, "value": "\"workForChanged\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Utils.swift", "kind": "StringLiteral", - "offset": 934, + "offset": 1239, "length": 14, "value": "\"workForBegin\"" }, { - "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Radio\/MTWebpage.swift", + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Radio\/MyTunerWebPage.swift", "kind": "StringLiteral", "offset": 296, "length": 35, diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface index 6c30dec..1f2b97b 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface @@ -537,15 +537,28 @@ public enum M2NetConnecttionType { get } } -@_Concurrency.MainActor public struct M2NetMonitor { - @_Concurrency.MainActor public func start(monitorHandler: @escaping (_ isConnected: Swift.Bool) -> Swift.Void) - @_Concurrency.MainActor public var isConnected: Swift.Bool { +@_hasMissingDesignatedInitializers @_Concurrency.MainActor final public class M2NetMonitor : Foundation.ObservableObject { + @_Concurrency.MainActor public static let shared: M2Kit.M2NetMonitor + @Combine.Published @_projectedValueProperty($isConnected) @_Concurrency.MainActor final public var isConnected: Swift.Bool { get } - @_Concurrency.MainActor public var connectionType: M2Kit.M2NetConnecttionType { + @_Concurrency.MainActor final public var $isConnected: Combine.Published.Publisher { get } - @_Concurrency.MainActor public func stop() + @Combine.Published @_projectedValueProperty($connectionType) @_Concurrency.MainActor final public var connectionType: M2Kit.M2NetConnecttionType { + get + } + @_Concurrency.MainActor final public var $connectionType: Combine.Published.Publisher { + get + } + @Combine.Published @_projectedValueProperty($isReady) @_Concurrency.MainActor final public var isReady: Swift.Bool { + get + } + @_Concurrency.MainActor final public var $isReady: Combine.Published.Publisher { + get + } + public typealias ObjectWillChangePublisher = Combine.ObservableObjectPublisher + @objc deinit } @_Concurrency.MainActor public struct M2Radio { } @@ -888,6 +901,7 @@ public enum M2VideoStatus { @_Concurrency.MainActor public static func checkStatus(trackID: Swift.String) -> M2Kit.M2VideoStatus @_Concurrency.MainActor public static func deleteDataOf(trackID: Swift.String) @_Concurrency.MainActor public static func filePathOf(trackID: Swift.String) -> Swift.String + @_Concurrency.MainActor public static func enableWorkForInCellularNetwork(_ enable: Swift.Bool) } extension M2Kit.M2Utils { @_Concurrency.MainActor public static var countryCode: Swift.String { diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.swiftinterface index 6c30dec..1f2b97b 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -537,15 +537,28 @@ public enum M2NetConnecttionType { get } } -@_Concurrency.MainActor public struct M2NetMonitor { - @_Concurrency.MainActor public func start(monitorHandler: @escaping (_ isConnected: Swift.Bool) -> Swift.Void) - @_Concurrency.MainActor public var isConnected: Swift.Bool { +@_hasMissingDesignatedInitializers @_Concurrency.MainActor final public class M2NetMonitor : Foundation.ObservableObject { + @_Concurrency.MainActor public static let shared: M2Kit.M2NetMonitor + @Combine.Published @_projectedValueProperty($isConnected) @_Concurrency.MainActor final public var isConnected: Swift.Bool { get } - @_Concurrency.MainActor public var connectionType: M2Kit.M2NetConnecttionType { + @_Concurrency.MainActor final public var $isConnected: Combine.Published.Publisher { get } - @_Concurrency.MainActor public func stop() + @Combine.Published @_projectedValueProperty($connectionType) @_Concurrency.MainActor final public var connectionType: M2Kit.M2NetConnecttionType { + get + } + @_Concurrency.MainActor final public var $connectionType: Combine.Published.Publisher { + get + } + @Combine.Published @_projectedValueProperty($isReady) @_Concurrency.MainActor final public var isReady: Swift.Bool { + get + } + @_Concurrency.MainActor final public var $isReady: Combine.Published.Publisher { + get + } + public typealias ObjectWillChangePublisher = Combine.ObservableObjectPublisher + @objc deinit } @_Concurrency.MainActor public struct M2Radio { } @@ -888,6 +901,7 @@ public enum M2VideoStatus { @_Concurrency.MainActor public static func checkStatus(trackID: Swift.String) -> M2Kit.M2VideoStatus @_Concurrency.MainActor public static func deleteDataOf(trackID: Swift.String) @_Concurrency.MainActor public static func filePathOf(trackID: Swift.String) -> Swift.String + @_Concurrency.MainActor public static func enableWorkForInCellularNetwork(_ enable: Swift.Bool) } extension M2Kit.M2Utils { @_Concurrency.MainActor public static var countryCode: Swift.String { diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.abi.json b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.abi.json index b6d74be..985cb9a 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.abi.json +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.abi.json @@ -32,6 +32,13 @@ "declKind": "Import", "moduleName": "M2Kit" }, + { + "kind": "Import", + "name": "Combine", + "printedName": "Combine", + "declKind": "Import", + "moduleName": "M2Kit" + }, { "kind": "Import", "name": "Foundation", @@ -13841,6 +13848,13 @@ "declKind": "Import", "moduleName": "M2Kit" }, + { + "kind": "Import", + "name": "Combine", + "printedName": "Combine", + "declKind": "Import", + "moduleName": "M2Kit" + }, { "kind": "TypeDecl", "name": "M2NetConnecttionType", @@ -14135,43 +14149,56 @@ "printedName": "M2NetMonitor", "children": [ { - "kind": "Function", - "name": "start", - "printedName": "start(monitorHandler:)", + "kind": "Var", + "name": "shared", + "printedName": "shared", "children": [ { "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - }, - { - "kind": "TypeFunc", - "name": "Function", - "printedName": "(Swift.Bool) -> ()", - "children": [ - { - "kind": "TypeNominal", - "name": "Void", - "printedName": "()" - }, - { - "kind": "TypeNominal", - "name": "Bool", - "printedName": "Swift.Bool", - "usr": "s:Sb" - } - ] + "name": "M2NetMonitor", + "printedName": "M2Kit.M2NetMonitor", + "usr": "s:5M2Kit0A10NetMonitorC" } ], - "declKind": "Func", - "usr": "s:5M2Kit0A10NetMonitorV5start14monitorHandleryySbc_tF", - "mangledName": "$s5M2Kit0A10NetMonitorV5start14monitorHandleryySbc_tF", + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC6sharedACvpZ", + "mangledName": "$s5M2Kit0A10NetMonitorC6sharedACvpZ", "moduleName": "M2Kit", + "static": true, "declAttributes": [ + "HasInitialValue", + "Final", + "HasStorage", "Custom", "AccessControl" ], - "funcSelfKind": "NonMutating" + "isLet": true, + "hasStorage": true, + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "M2NetMonitor", + "printedName": "M2Kit.M2NetMonitor", + "usr": "s:5M2Kit0A10NetMonitorC" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC6sharedACvgZ", + "mangledName": "$s5M2Kit0A10NetMonitorC6sharedACvgZ", + "moduleName": "M2Kit", + "static": true, + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] }, { "kind": "Var", @@ -14186,12 +14213,16 @@ } ], "declKind": "Var", - "usr": "s:5M2Kit0A10NetMonitorV11isConnectedSbvp", - "mangledName": "$s5M2Kit0A10NetMonitorV11isConnectedSbvp", + "usr": "s:5M2Kit0A10NetMonitorC11isConnectedSbvp", + "mangledName": "$s5M2Kit0A10NetMonitorC11isConnectedSbvp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom" ], "accessors": [ { @@ -14207,9 +14238,59 @@ } ], "declKind": "Accessor", - "usr": "s:5M2Kit0A10NetMonitorV11isConnectedSbvg", - "mangledName": "$s5M2Kit0A10NetMonitorV11isConnectedSbvg", + "usr": "s:5M2Kit0A10NetMonitorC11isConnectedSbvg", + "mangledName": "$s5M2Kit0A10NetMonitorC11isConnectedSbvg", "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "$isConnected", + "printedName": "$isConnected", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC12$isConnected7Combine9PublishedV9PublisherVySb_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], "accessorKind": "get" } ] @@ -14227,12 +14308,16 @@ } ], "declKind": "Var", - "usr": "s:5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovp", - "mangledName": "$s5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovp", + "usr": "s:5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovp", + "mangledName": "$s5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom" ], "accessors": [ { @@ -14248,44 +14333,193 @@ } ], "declKind": "Accessor", - "usr": "s:5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovg", - "mangledName": "$s5M2Kit0A10NetMonitorV14connectionTypeAA0ac11ConnecttionF0Ovg", + "usr": "s:5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovg", + "mangledName": "$s5M2Kit0A10NetMonitorC14connectionTypeAA0ac11ConnecttionF0Ovg", "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], "accessorKind": "get" } ] }, { - "kind": "Function", - "name": "stop", - "printedName": "stop()", + "kind": "Var", + "name": "$connectionType", + "printedName": "$connectionType", "children": [ { "kind": "TypeNominal", - "name": "Void", - "printedName": "()" + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" } ], - "declKind": "Func", - "usr": "s:5M2Kit0A10NetMonitorV4stopyyF", - "mangledName": "$s5M2Kit0A10NetMonitorV4stopyyF", + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC15$connectionType7Combine9PublishedV9PublisherVyAA0ac11ConnecttionF0O_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "isReady", + "printedName": "isReady", + "children": [ + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC7isReadySbvp", + "mangledName": "$s5M2Kit0A10NetMonitorC7isReadySbvp", "moduleName": "M2Kit", "declAttributes": [ + "Final", "Custom", - "AccessControl" + "ProjectedValueProperty", + "SetterAccess", + "AccessControl", + "Custom", + "RawDocComment" ], - "funcSelfKind": "NonMutating" + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC7isReadySbvg", + "mangledName": "$s5M2Kit0A10NetMonitorC7isReadySbvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] + }, + { + "kind": "Var", + "name": "$isReady", + "printedName": "$isReady", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Var", + "usr": "s:5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvp", + "mangledName": "$s5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvp", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final", + "Custom" + ], + "accessors": [ + { + "kind": "Accessor", + "name": "Get", + "printedName": "Get()", + "children": [ + { + "kind": "TypeNominal", + "name": "Publisher", + "printedName": "Combine.Published.Publisher", + "usr": "s:7Combine9PublishedV9PublisherV" + } + ], + "declKind": "Accessor", + "usr": "s:5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvg", + "mangledName": "$s5M2Kit0A10NetMonitorC8$isReady7Combine9PublishedV9PublisherVySb_Gvg", + "moduleName": "M2Kit", + "implicit": true, + "declAttributes": [ + "Final" + ], + "accessorKind": "get" + } + ] } ], - "declKind": "Struct", - "usr": "s:5M2Kit0A10NetMonitorV", - "mangledName": "$s5M2Kit0A10NetMonitorV", + "declKind": "Class", + "usr": "s:5M2Kit0A10NetMonitorC", + "mangledName": "$s5M2Kit0A10NetMonitorC", "moduleName": "M2Kit", "declAttributes": [ + "Final", "AccessControl", "Custom" ], + "hasMissingDesignatedInitializers": true, "conformances": [ + { + "kind": "Conformance", + "name": "ObservableObject", + "printedName": "ObservableObject", + "children": [ + { + "kind": "TypeWitness", + "name": "ObjectWillChangePublisher", + "printedName": "ObjectWillChangePublisher", + "children": [ + { + "kind": "TypeNominal", + "name": "ObservableObjectPublisher", + "printedName": "Combine.ObservableObjectPublisher", + "usr": "s:7Combine25ObservableObjectPublisherC" + } + ] + } + ], + "usr": "s:7Combine16ObservableObjectP", + "mangledName": "$s7Combine16ObservableObjectP" + }, { "kind": "Conformance", "name": "Copyable", @@ -21891,6 +22125,35 @@ ], "funcSelfKind": "NonMutating" }, + { + "kind": "Function", + "name": "enableWorkForInCellularNetwork", + "printedName": "enableWorkForInCellularNetwork(_:)", + "children": [ + { + "kind": "TypeNominal", + "name": "Void", + "printedName": "()" + }, + { + "kind": "TypeNominal", + "name": "Bool", + "printedName": "Swift.Bool", + "usr": "s:Sb" + } + ], + "declKind": "Func", + "usr": "s:5M2Kit0A5UtilsV30enableWorkForInCellularNetworkyySbFZ", + "mangledName": "$s5M2Kit0A5UtilsV30enableWorkForInCellularNetworkyySbFZ", + "moduleName": "M2Kit", + "static": true, + "declAttributes": [ + "Custom", + "AccessControl", + "RawDocComment" + ], + "funcSelfKind": "NonMutating" + }, { "kind": "Var", "name": "countryCode", @@ -22908,15 +23171,15 @@ }, { "kind": "Import", - "name": "WebKit", - "printedName": "WebKit", + "name": "JavaScriptCore", + "printedName": "JavaScriptCore", "declKind": "Import", "moduleName": "M2Kit" }, { "kind": "Import", - "name": "JavaScriptCore", - "printedName": "JavaScriptCore", + "name": "M2KitMacros", + "printedName": "M2KitMacros", "declKind": "Import", "moduleName": "M2Kit" }, @@ -22929,15 +23192,15 @@ }, { "kind": "Import", - "name": "JavaScriptCore", - "printedName": "JavaScriptCore", + "name": "WebKit", + "printedName": "WebKit", "declKind": "Import", "moduleName": "M2Kit" }, { "kind": "Import", - "name": "M2KitMacros", - "printedName": "M2KitMacros", + "name": "JavaScriptCore", + "printedName": "JavaScriptCore", "declKind": "Import", "moduleName": "M2Kit" }, @@ -24881,77 +25144,77 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 258, + "offset": 256, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 277, + "offset": 275, "length": 1, "value": "8" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 296, + "offset": 294, "length": 2, "value": "16" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 318, + "offset": 316, "length": 2, "value": "24" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 337, + "offset": 335, "length": 2, "value": "32" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 359, + "offset": 357, "length": 2, "value": "40" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 379, + "offset": 377, "length": 2, "value": "48" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "IntegerLiteral", - "offset": 399, + "offset": 397, "length": 2, "value": "56" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1065, + "offset": 1063, "length": 14, "value": "\"HH:mm:ss.SSS\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1262, + "offset": 1260, "length": 3, "value": "\" \"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/CFUtils.swift", "kind": "StringLiteral", - "offset": 1288, + "offset": 1286, "length": 4, "value": "\"\n\"" }, @@ -25595,7 +25858,14 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/NetMonitor.swift", "kind": "BooleanLiteral", - "offset": 345, + "offset": 413, + "length": 5, + "value": "false" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Core\/NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 467, "length": 5, "value": "false" }, @@ -26008,14 +26278,14 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/UserDefaultsWrapper.swift", "kind": "BooleanLiteral", - "offset": 1624, + "offset": 1631, "length": 5, "value": "false" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/UserDefaultsWrapper.swift", "kind": "BooleanLiteral", - "offset": 1843, + "offset": 1850, "length": 5, "value": "false" }, @@ -26033,73 +26303,87 @@ "length": 14, "value": "\".kBackupCode\"" }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", + "kind": "BooleanLiteral", + "offset": 399, + "length": 4, + "value": "true" + }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 381, + "offset": 327, + "length": 25, + "value": "\".kEnableWorkForCellular\"" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", + "kind": "StringLiteral", + "offset": 493, "length": 4, "value": "\"US\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 327, + "offset": 439, "length": 15, "value": "\".kCountryCode\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "IntegerLiteral", - "offset": 730, + "offset": 842, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 842, + "offset": 954, "length": 2, "value": "\"\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "IntegerLiteral", - "offset": 1331, + "offset": 1443, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 1269, + "offset": 1381, "length": 22, "value": "\".kSavedCfgVersionKey\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 1368, + "offset": 1480, "length": 15, "value": "\".kSavedCfgKey\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils.swift", "kind": "StringLiteral", - "offset": 8267, + "offset": 8379, "length": 11, "value": "\"123aA@123\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils++V4.swift", "kind": "StringLiteral", - "offset": 150, + "offset": 153, "length": 12, "value": "\"image\/jpeg\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Helper\/Utils++V4.swift", "kind": "StringLiteral", - "offset": 191, + "offset": 194, "length": 18, "value": "\"application\/json\"" }, @@ -26134,56 +26418,56 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 3766, + "offset": 3765, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "Dictionary", - "offset": 3951, + "offset": 3950, "length": 3, "value": "[]" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "Dictionary", - "offset": 4009, + "offset": 4008, "length": 3, "value": "[]" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5667, + "offset": 5666, "length": 1, "value": "0" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5750, + "offset": 5749, "length": 1, "value": "1" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5843, + "offset": 5842, "length": 1, "value": "2" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 5948, + "offset": 5947, "length": 1, "value": "3" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/JSCore\/XMLHttpRequest.swift", "kind": "IntegerLiteral", - "offset": 6042, + "offset": 6041, "length": 1, "value": "4" }, @@ -26192,7 +26476,7 @@ "kind": "StringLiteral", "offset": 131, "length": 6, - "value": "\"5.34\"" + "value": "\"5.35\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2IAP.swift", @@ -26278,6 +26562,20 @@ "length": 1, "value": "1" }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 392, + "length": 5, + "value": "false" + }, + { + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2NetMonitor.swift", + "kind": "BooleanLiteral", + "offset": 578, + "length": 5, + "value": "false" + }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Setting.swift", "kind": "StringLiteral", @@ -26911,19 +27209,19 @@ { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Utils.swift", "kind": "StringLiteral", - "offset": 807, + "offset": 1112, "length": 16, "value": "\"workForChanged\"" }, { "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Public\/M2Utils.swift", "kind": "StringLiteral", - "offset": 934, + "offset": 1239, "length": 14, "value": "\"workForBegin\"" }, { - "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Radio\/MTWebpage.swift", + "filePath": "\/Users\/cuongkc\/Projects\/M2Kit\/M2Kit\/Radio\/MyTunerWebPage.swift", "kind": "StringLiteral", "offset": 296, "length": 35, diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface index 448097d..5e42215 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface @@ -537,15 +537,28 @@ public enum M2NetConnecttionType { get } } -@_Concurrency.MainActor public struct M2NetMonitor { - @_Concurrency.MainActor public func start(monitorHandler: @escaping (_ isConnected: Swift.Bool) -> Swift.Void) - @_Concurrency.MainActor public var isConnected: Swift.Bool { +@_hasMissingDesignatedInitializers @_Concurrency.MainActor final public class M2NetMonitor : Foundation.ObservableObject { + @_Concurrency.MainActor public static let shared: M2Kit.M2NetMonitor + @Combine.Published @_projectedValueProperty($isConnected) @_Concurrency.MainActor final public var isConnected: Swift.Bool { get } - @_Concurrency.MainActor public var connectionType: M2Kit.M2NetConnecttionType { + @_Concurrency.MainActor final public var $isConnected: Combine.Published.Publisher { get } - @_Concurrency.MainActor public func stop() + @Combine.Published @_projectedValueProperty($connectionType) @_Concurrency.MainActor final public var connectionType: M2Kit.M2NetConnecttionType { + get + } + @_Concurrency.MainActor final public var $connectionType: Combine.Published.Publisher { + get + } + @Combine.Published @_projectedValueProperty($isReady) @_Concurrency.MainActor final public var isReady: Swift.Bool { + get + } + @_Concurrency.MainActor final public var $isReady: Combine.Published.Publisher { + get + } + public typealias ObjectWillChangePublisher = Combine.ObservableObjectPublisher + @objc deinit } @_Concurrency.MainActor public struct M2Radio { } @@ -888,6 +901,7 @@ public enum M2VideoStatus { @_Concurrency.MainActor public static func checkStatus(trackID: Swift.String) -> M2Kit.M2VideoStatus @_Concurrency.MainActor public static func deleteDataOf(trackID: Swift.String) @_Concurrency.MainActor public static func filePathOf(trackID: Swift.String) -> Swift.String + @_Concurrency.MainActor public static func enableWorkForInCellularNetwork(_ enable: Swift.Bool) } extension M2Kit.M2Utils { @_Concurrency.MainActor public static var countryCode: Swift.String { diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index 448097d..5e42215 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -537,15 +537,28 @@ public enum M2NetConnecttionType { get } } -@_Concurrency.MainActor public struct M2NetMonitor { - @_Concurrency.MainActor public func start(monitorHandler: @escaping (_ isConnected: Swift.Bool) -> Swift.Void) - @_Concurrency.MainActor public var isConnected: Swift.Bool { +@_hasMissingDesignatedInitializers @_Concurrency.MainActor final public class M2NetMonitor : Foundation.ObservableObject { + @_Concurrency.MainActor public static let shared: M2Kit.M2NetMonitor + @Combine.Published @_projectedValueProperty($isConnected) @_Concurrency.MainActor final public var isConnected: Swift.Bool { get } - @_Concurrency.MainActor public var connectionType: M2Kit.M2NetConnecttionType { + @_Concurrency.MainActor final public var $isConnected: Combine.Published.Publisher { get } - @_Concurrency.MainActor public func stop() + @Combine.Published @_projectedValueProperty($connectionType) @_Concurrency.MainActor final public var connectionType: M2Kit.M2NetConnecttionType { + get + } + @_Concurrency.MainActor final public var $connectionType: Combine.Published.Publisher { + get + } + @Combine.Published @_projectedValueProperty($isReady) @_Concurrency.MainActor final public var isReady: Swift.Bool { + get + } + @_Concurrency.MainActor final public var $isReady: Combine.Published.Publisher { + get + } + public typealias ObjectWillChangePublisher = Combine.ObservableObjectPublisher + @objc deinit } @_Concurrency.MainActor public struct M2Radio { } @@ -888,6 +901,7 @@ public enum M2VideoStatus { @_Concurrency.MainActor public static func checkStatus(trackID: Swift.String) -> M2Kit.M2VideoStatus @_Concurrency.MainActor public static func deleteDataOf(trackID: Swift.String) @_Concurrency.MainActor public static func filePathOf(trackID: Swift.String) -> Swift.String + @_Concurrency.MainActor public static func enableWorkForInCellularNetwork(_ enable: Swift.Bool) } extension M2Kit.M2Utils { @_Concurrency.MainActor public static var countryCode: Swift.String { diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/_CodeSignature/CodeDirectory b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/_CodeSignature/CodeDirectory index 8da003d..a9d976a 100644 Binary files a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/_CodeSignature/CodeDirectory and b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/_CodeSignature/CodeDirectory differ diff --git a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/_CodeSignature/CodeResources b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/_CodeSignature/CodeResources index 3895ad5..7476504 100644 --- a/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/_CodeSignature/CodeResources +++ b/Frameworks/M2Kit.xcframework/ios-arm64_x86_64-simulator/M2Kit.framework/_CodeSignature/CodeResources @@ -10,15 +10,15 @@ Info.plist - hBQql2f1nqzZr8ThrAKMBmxOIOo= + PYogd+hy6knzlZMlZqnt/6otXqQ= Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.abi.json - DLFiYWNfE3LWDaPf90sW+sjd5No= + Fva/KBWcztni5NvNeTyWvX2WlF4= Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface - 5sV9ST5PvM1vUAWG81tv+P3XibI= + 8buWAw/ZK6G+N23carWf9WBJBU8= Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.swiftdoc @@ -26,19 +26,19 @@ Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.swiftinterface - 5sV9ST5PvM1vUAWG81tv+P3XibI= + 8buWAw/ZK6G+N23carWf9WBJBU8= Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.swiftmodule - mHcFrolkGKA1Yg4/MC1ah6YnZYw= + jZHFLq5c1zmMK8xKduqxECWpHRQ= Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.abi.json - DLFiYWNfE3LWDaPf90sW+sjd5No= + Fva/KBWcztni5NvNeTyWvX2WlF4= Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface - pxKt6HpTwry7qw5k/SvavxYlDIk= + BB78lMYBU4kDVqmC87ESvGuk5qI= Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.swiftdoc @@ -46,11 +46,11 @@ Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - pxKt6HpTwry7qw5k/SvavxYlDIk= + BB78lMYBU4kDVqmC87ESvGuk5qI= Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - /gtcbPmxPuElEwYdN5GDnHF9i/c= + ty9IdDafmqG0c3249Xyb0YCiuOM= Modules/module.modulemap @@ -70,14 +70,14 @@ hash2 - umCu+f7IAazsTjTEHq8RXZ9D8wStad6NqkZh7xJGSOs= + 98NrTOHY6D0BRebJlQsytBo5Ma+HcHhZ6gR6K/LUI1M= Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface hash2 - JcLskbl1EF3whhLrSuxtLszpnCec1EI40i+/E4VXdRY= + jEC4CyJZ9gD0BWPhiZcDKH1h4HyjH7xm73QW2rYFfDc= Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.swiftdoc @@ -91,28 +91,28 @@ hash2 - JcLskbl1EF3whhLrSuxtLszpnCec1EI40i+/E4VXdRY= + jEC4CyJZ9gD0BWPhiZcDKH1h4HyjH7xm73QW2rYFfDc= Modules/M2Kit.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash2 - DM2UJ84/QGSG7nEZW8jReJb+aK2UHN+x01ImO2t23LI= + 90ZfrZAPW5D3dN7yK92i2mNKBtZKeXAX2PGiAmbR9q0= Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.abi.json hash2 - umCu+f7IAazsTjTEHq8RXZ9D8wStad6NqkZh7xJGSOs= + 98NrTOHY6D0BRebJlQsytBo5Ma+HcHhZ6gR6K/LUI1M= Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface hash2 - xe8+e4yJbAY3LD3Q49dHSCRB3IUuHkm0IQ3l6kvE2cg= + Ab5oE/nYcAnFUkTWbAAe4wkbiFrJjiUJU2UoLHZW21c= Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.swiftdoc @@ -126,14 +126,14 @@ hash2 - xe8+e4yJbAY3LD3Q49dHSCRB3IUuHkm0IQ3l6kvE2cg= + Ab5oE/nYcAnFUkTWbAAe4wkbiFrJjiUJU2UoLHZW21c= Modules/M2Kit.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash2 - WmydAffhAHU9YFfiNqDxUSDu0A+cz37r2ECVA7QlmoE= + 87Iq9BBtBpOJAK30WqkITfkM0hisfhk4VskgvOkDrRk= Modules/module.modulemap diff --git a/README.md b/README.md index 17f3c8a..2f79a47 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ M2Kit ===== -5.34 \ No newline at end of file +5.35 \ No newline at end of file