From ce0c6ff83219d669a717d78d74376fec96bd543d Mon Sep 17 00:00:00 2001
From: std-s <>
Date: Thu, 29 Jun 2023 19:55:36 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20iOS=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/libraries/Dart_SDK.xml | 38 +-
example/ios/Podfile.lock | 29 ++
example/ios/Runner.xcodeproj/project.pbxproj | 47 +-
.../AppIcon.appiconset/Contents.json | 99 ++---
.../Icon-App-1024x1024@1x.png | 0
.../AppIcon.appiconset/Icon-App-20x20@1x.png | 0
.../AppIcon.appiconset/Icon-App-20x20@2x.png | 0
.../AppIcon.appiconset/Icon-App-20x20@3x.png | 0
.../AppIcon.appiconset/Icon-App-29x29@1x.png | 0
.../AppIcon.appiconset/Icon-App-29x29@2x.png | 0
.../AppIcon.appiconset/Icon-App-29x29@3x.png | 0
.../AppIcon.appiconset/Icon-App-40x40@1x.png | 0
.../AppIcon.appiconset/Icon-App-40x40@2x.png | 0
.../AppIcon.appiconset/Icon-App-40x40@3x.png | 0
.../AppIcon.appiconset/Icon-App-60x60@2x.png | 0
.../AppIcon.appiconset/Icon-App-60x60@3x.png | 0
.../AppIcon.appiconset/Icon-App-76x76@1x.png | 0
.../AppIcon.appiconset/Icon-App-76x76@2x.png | 0
.../Icon-App-83.5x83.5@2x.png | 0
.../LaunchImage.imageset/Contents.json | 7 +-
.../LaunchImage.imageset/LaunchImage.png | 0
.../LaunchImage.imageset/LaunchImage@2x.png | 0
.../LaunchImage.imageset/LaunchImage@3x.png | 0
example/ios/Runner/Info.plist | 8 +-
example/lib/main.dart | 9 +-
example/pubspec.lock | 38 +-
ios/Classes/Module/IMManager.swift | 44 ++
ios/Classes/Module/MessageManager.swift | 4 +-
ios/Classes/Reachability.swift | 405 ++++++++++++++++++
pubspec.lock | 36 +-
30 files changed, 593 insertions(+), 171 deletions(-)
create mode 100644 example/ios/Podfile.lock
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
delete mode 100644 example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
delete mode 100644 example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
create mode 100644 ios/Classes/Reachability.swift
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
index 71fcae3..21b2095 100644
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@@ -1,25 +1,25 @@
<component name="libraryTable">
<library name="Dart SDK">
<CLASSES>
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/async" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/cli" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/collection" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/convert" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/core" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/developer" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/ffi" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/html" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/indexed_db" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/io" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/isolate" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/js" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/js_util" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/math" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/mirrors" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/svg" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/typed_data" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/web_audio" />
- <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/web_gl" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/async" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/cli" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/collection" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/convert" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/core" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/developer" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/ffi" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/html" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/indexed_db" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/io" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/isolate" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/js" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/js_util" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/math" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/mirrors" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/svg" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/typed_data" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/web_audio" />
+ <root url="file://$PROJECT_DIR$/../../../framework/flutter/bin/cache/dart-sdk/lib/web_gl" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
new file mode 100644
index 0000000..d66acb8
--- /dev/null
+++ b/example/ios/Podfile.lock
@@ -0,0 +1,29 @@
+PODS:
+ - Flutter (1.0.0)
+ - flutter_openim_sdk (0.0.1):
+ - Flutter
+ - OpenIMSDKCore (= 3.0.0-beta)
+ - OpenIMSDKCore (3.0.0-beta)
+
+DEPENDENCIES:
+ - Flutter (from `Flutter`)
+ - flutter_openim_sdk (from `.symlinks/plugins/flutter_openim_sdk/ios`)
+
+SPEC REPOS:
+ trunk:
+ - OpenIMSDKCore
+
+EXTERNAL SOURCES:
+ Flutter:
+ :path: Flutter
+ flutter_openim_sdk:
+ :path: ".symlinks/plugins/flutter_openim_sdk/ios"
+
+SPEC CHECKSUMS:
+ Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+ flutter_openim_sdk: ed909a3ad758f605a188acd96d6f38f27953016f
+ OpenIMSDKCore: 4f3815fe8e0a6ef4130894afd2e8ad4d343df66e
+
+PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d
+
+COCOAPODS: 1.11.3
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index aa56dbf..868ae38 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
- 6F7F8B794B6D663E7A65A104 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1971A63CCEC4B744C25980F8 /* Pods_Runner.framework */; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -30,16 +29,12 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 076751BE520B721535096B75 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
- 1971A63CCEC4B744C25980F8 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- 3A6AB9CCD90A2F5C2CE719D0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
- 7CF14C3CACE83F04F858C9EC /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -54,21 +49,12 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 6F7F8B794B6D663E7A65A104 /* Pods_Runner.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
- 4B877210D623EE0FDE18A08F /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- 1971A63CCEC4B744C25980F8 /* Pods_Runner.framework */,
- );
- name = Frameworks;
- sourceTree = "<group>";
- };
9740EEB11CF90186004384FC /* Flutter */ = {
isa = PBXGroup;
children = (
@@ -87,7 +73,6 @@
97C146F01CF9000F007C117D /* Runner */,
97C146EF1CF9000F007C117D /* Products */,
E653626F5A38799455FF26C4 /* Pods */,
- 4B877210D623EE0FDE18A08F /* Frameworks */,
);
sourceTree = "<group>";
};
@@ -117,9 +102,6 @@
E653626F5A38799455FF26C4 /* Pods */ = {
isa = PBXGroup;
children = (
- 7CF14C3CACE83F04F858C9EC /* Pods-Runner.debug.xcconfig */,
- 3A6AB9CCD90A2F5C2CE719D0 /* Pods-Runner.release.xcconfig */,
- 076751BE520B721535096B75 /* Pods-Runner.profile.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
@@ -131,7 +113,6 @@
isa = PBXNativeTarget;
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = (
- FA9CAD2EF743D14467F7D993 /* [CP] Check Pods Manifest.lock */,
9740EEB61CF901F6004384FC /* Run Script */,
97C146EA1CF9000F007C117D /* Sources */,
97C146EB1CF9000F007C117D /* Frameworks */,
@@ -226,28 +207,6 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
};
- FA9CAD2EF743D14467F7D993 /* [CP] Check Pods Manifest.lock */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputFileListPaths = (
- );
- inputPaths = (
- "${PODS_PODFILE_DIR_PATH}/Podfile.lock",
- "${PODS_ROOT}/Manifest.lock",
- );
- name = "[CP] Check Pods Manifest.lock";
- outputFileListPaths = (
- );
- outputPaths = (
- "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
- showEnvVarsInLog = 0;
- };
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -348,7 +307,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = io.openim.flutterOpenimSdkExample;
+ PRODUCT_BUNDLE_IDENTIFIER = cn.rentsoft.uni;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
@@ -480,7 +439,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = io.openim.flutterOpenimSdkExample;
+ PRODUCT_BUNDLE_IDENTIFIER = cn.rentsoft.uni;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -504,7 +463,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = io.openim.flutterOpenimSdkExample;
+ PRODUCT_BUNDLE_IDENTIFIER = cn.rentsoft.uni;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index d36b1fa..ee868db 100644
--- a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1,103 @@
{
"images" : [
{
- "size" : "20x20",
"idiom" : "iphone",
- "filename" : "Icon-App-20x20@2x.png",
- "scale" : "2x"
+ "scale" : "2x",
+ "size" : "20x20"
},
{
- "size" : "20x20",
"idiom" : "iphone",
- "filename" : "Icon-App-20x20@3x.png",
- "scale" : "3x"
+ "scale" : "3x",
+ "size" : "20x20"
},
{
- "size" : "29x29",
"idiom" : "iphone",
- "filename" : "Icon-App-29x29@1x.png",
- "scale" : "1x"
+ "scale" : "1x",
+ "size" : "29x29"
},
{
- "size" : "29x29",
"idiom" : "iphone",
- "filename" : "Icon-App-29x29@2x.png",
- "scale" : "2x"
+ "scale" : "2x",
+ "size" : "29x29"
},
{
- "size" : "29x29",
"idiom" : "iphone",
- "filename" : "Icon-App-29x29@3x.png",
- "scale" : "3x"
+ "scale" : "3x",
+ "size" : "29x29"
},
{
- "size" : "40x40",
"idiom" : "iphone",
- "filename" : "Icon-App-40x40@2x.png",
- "scale" : "2x"
+ "scale" : "2x",
+ "size" : "40x40"
},
{
- "size" : "40x40",
"idiom" : "iphone",
- "filename" : "Icon-App-40x40@3x.png",
- "scale" : "3x"
+ "scale" : "3x",
+ "size" : "40x40"
},
{
- "size" : "60x60",
"idiom" : "iphone",
- "filename" : "Icon-App-60x60@2x.png",
- "scale" : "2x"
+ "scale" : "2x",
+ "size" : "60x60"
},
{
- "size" : "60x60",
"idiom" : "iphone",
- "filename" : "Icon-App-60x60@3x.png",
- "scale" : "3x"
+ "scale" : "3x",
+ "size" : "60x60"
},
{
- "size" : "20x20",
"idiom" : "ipad",
- "filename" : "Icon-App-20x20@1x.png",
- "scale" : "1x"
+ "scale" : "1x",
+ "size" : "20x20"
},
{
- "size" : "20x20",
"idiom" : "ipad",
- "filename" : "Icon-App-20x20@2x.png",
- "scale" : "2x"
+ "scale" : "2x",
+ "size" : "20x20"
},
{
- "size" : "29x29",
"idiom" : "ipad",
- "filename" : "Icon-App-29x29@1x.png",
- "scale" : "1x"
+ "scale" : "1x",
+ "size" : "29x29"
},
{
- "size" : "29x29",
"idiom" : "ipad",
- "filename" : "Icon-App-29x29@2x.png",
- "scale" : "2x"
+ "scale" : "2x",
+ "size" : "29x29"
},
{
- "size" : "40x40",
"idiom" : "ipad",
- "filename" : "Icon-App-40x40@1x.png",
- "scale" : "1x"
+ "scale" : "1x",
+ "size" : "40x40"
},
{
- "size" : "40x40",
"idiom" : "ipad",
- "filename" : "Icon-App-40x40@2x.png",
- "scale" : "2x"
+ "scale" : "2x",
+ "size" : "40x40"
},
{
- "size" : "76x76",
"idiom" : "ipad",
- "filename" : "Icon-App-76x76@1x.png",
- "scale" : "1x"
+ "scale" : "1x",
+ "size" : "76x76"
},
{
- "size" : "76x76",
"idiom" : "ipad",
- "filename" : "Icon-App-76x76@2x.png",
- "scale" : "2x"
+ "scale" : "2x",
+ "size" : "76x76"
},
{
- "size" : "83.5x83.5",
"idiom" : "ipad",
- "filename" : "Icon-App-83.5x83.5@2x.png",
- "scale" : "2x"
+ "scale" : "2x",
+ "size" : "83.5x83.5"
},
{
- "size" : "1024x1024",
"idiom" : "ios-marketing",
- "filename" : "Icon-App-1024x1024@1x.png",
- "scale" : "1x"
+ "scale" : "1x",
+ "size" : "1024x1024"
}
],
"info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
}
}
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
index 0bedcf2..a19a549 100644
--- a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -2,22 +2,19 @@
"images" : [
{
"idiom" : "universal",
- "filename" : "LaunchImage.png",
"scale" : "1x"
},
{
"idiom" : "universal",
- "filename" : "LaunchImage@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
- "filename" : "LaunchImage@3x.png",
"scale" : "3x"
}
],
"info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
}
}
diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
deleted file mode 100644
index e69de29..0000000
diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
index 7be20fa..3e015a4 100644
--- a/example/ios/Runner/Info.plist
+++ b/example/ios/Runner/Info.plist
@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>CADisableMinimumFrameDurationOnPhone</key>
+ <true/>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
@@ -22,6 +24,8 @@
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
+ <key>UIApplicationSupportsIndirectInputEvents</key>
+ <true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
@@ -41,9 +45,5 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
- <key>CADisableMinimumFrameDurationOnPhone</key>
- <true/>
- <key>UIApplicationSupportsIndirectInputEvents</key>
- <true/>
</dict>
</plist>
diff --git a/example/lib/main.dart b/example/lib/main.dart
index e0d2b32..4cb03cb 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -1,5 +1,5 @@
-
import 'package:flutter/material.dart';
+import 'package:flutter_openim_sdk/flutter_openim_sdk.dart';
void main() {
runApp(MyApp());
@@ -14,6 +14,13 @@ class _MyAppState extends State<MyApp> {
@override
void initState() {
super.initState();
+ OpenIM.iMManager.initSDK(
+ platformID: 1,
+ apiAddr: '',
+ wsAddr: '',
+ dataDir: '/',
+ objectStorage: 'minio',
+ listener: OnConnectListener());
}
@override
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 48d52b9..1b0c595 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -6,7 +6,7 @@ packages:
description:
name: async
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "2.10.0"
boolean_selector:
@@ -14,7 +14,7 @@ packages:
description:
name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "2.1.1"
characters:
@@ -22,7 +22,7 @@ packages:
description:
name: characters
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.2.1"
clock:
@@ -30,7 +30,7 @@ packages:
description:
name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.1.1"
collection:
@@ -38,7 +38,7 @@ packages:
description:
name: collection
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.17.0"
cupertino_icons:
@@ -46,7 +46,7 @@ packages:
description:
name: cupertino_icons
sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.0.5"
fake_async:
@@ -54,7 +54,7 @@ packages:
description:
name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.3.1"
flutter:
@@ -79,7 +79,7 @@ packages:
description:
name: js
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "0.6.5"
matcher:
@@ -87,7 +87,7 @@ packages:
description:
name: matcher
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "0.12.13"
material_color_utilities:
@@ -95,7 +95,7 @@ packages:
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "0.2.0"
meta:
@@ -103,7 +103,7 @@ packages:
description:
name: meta
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.8.0"
path:
@@ -111,7 +111,7 @@ packages:
description:
name: path
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.8.2"
sky_engine:
@@ -124,7 +124,7 @@ packages:
description:
name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.9.1"
stack_trace:
@@ -132,7 +132,7 @@ packages:
description:
name: stack_trace
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.11.0"
stream_channel:
@@ -140,7 +140,7 @@ packages:
description:
name: stream_channel
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "2.1.1"
string_scanner:
@@ -148,7 +148,7 @@ packages:
description:
name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.2.0"
term_glyph:
@@ -156,7 +156,7 @@ packages:
description:
name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.2.1"
test_api:
@@ -164,7 +164,7 @@ packages:
description:
name: test_api
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "0.4.16"
vector_math:
@@ -172,7 +172,7 @@ packages:
description:
name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "2.1.4"
sdks:
diff --git a/ios/Classes/Module/IMManager.swift b/ios/Classes/Module/IMManager.swift
index 0a5e4e3..5386f2d 100644
--- a/ios/Classes/Module/IMManager.swift
+++ b/ios/Classes/Module/IMManager.swift
@@ -3,6 +3,8 @@ import OpenIMCore
public class IMMananger: BaseServiceManager {
+ let reachability = try? Reachability()
+
public override func registerHandlers() {
super.registerHandlers()
self["initSDK"] = initSDK
@@ -15,8 +17,50 @@ public class IMMananger: BaseServiceManager {
self["networkStatusChanged"] = networkStatusChanged
}
+ fileprivate func addObservers() {
+ NotificationCenter.default.addObserver(self,
+ selector: #selector(applicationWillEnterForeground),
+ name: UIApplication.willEnterForegroundNotification,
+ object: nil)
+
+ NotificationCenter.default.addObserver(self,
+ selector: #selector(applicationDidEnterBackground),
+ name: UIApplication.didEnterBackgroundNotification,
+ object: nil)
+
+ if let reachability {
+ do {
+ try reachability.startNotifier()
+ } catch (let e) {
+ print("reachability: \(e)")
+ }
+
+ reachability.whenReachable = { _ in
+ Open_im_sdkNetworkStatusChanged(BaseCallback(result: { _ in
+ }), UUID().uuidString)
+ }
+ reachability.whenUnreachable = { _ in
+ Open_im_sdkNetworkStatusChanged(BaseCallback(result: { _ in
+ }), UUID().uuidString)
+ }
+ }
+ }
+
+ @objc
+ fileprivate func applicationDidEnterBackground() {
+ Open_im_sdkSetAppBackgroundStatus(BaseCallback(result: { _ in
+ }), UUID().uuidString, true)
+ }
+
+ @objc
+ fileprivate func applicationWillEnterForeground() {
+ Open_im_sdkSetAppBackgroundStatus(BaseCallback(result: { _ in
+ }), UUID().uuidString, false)
+ }
+
func initSDK(methodCall: FlutterMethodCall, result: @escaping FlutterResult){
callBack(result,Open_im_sdkInitSDK(ConnListener(channel: self.channel), methodCall[string: "operationID"], methodCall.toJsonString()))
+ addObservers()
}
func login(methodCall: FlutterMethodCall, result: @escaping FlutterResult) {
diff --git a/ios/Classes/Module/MessageManager.swift b/ios/Classes/Module/MessageManager.swift
index 61f1507..984e567 100644
--- a/ios/Classes/Module/MessageManager.swift
+++ b/ios/Classes/Module/MessageManager.swift
@@ -293,7 +293,7 @@ public class AdvancedMsgListener: NSObject, Open_im_sdk_callbackOnAdvancedMsgLis
var values: [String: Any] = [:]
values["id"] = id
values["message"] = message
- CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onMsgDeleted", errCode: nil, errMsg: nil, data: values);<#code#>
+ CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onMsgDeleted", errCode: nil, errMsg: nil, data: values);
}
public func onNewRecvMessageRevoked(_ messageRevoked: String?) {
@@ -353,7 +353,7 @@ public class AdvancedMsgListener: NSObject, Open_im_sdk_callbackOnAdvancedMsgLis
var values: [String: Any] = [:]
values["id"] = id
values["messageList"] = messageList
- CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvOfflineNewMessages", errCode: nil, errMsg: nil, data: values);<#code#>
+ CommonUtil.emitEvent(channel: channel, method: "advancedMsgListener", type: "onRecvOfflineNewMessages", errCode: nil, errMsg: nil, data: values);
}
}
diff --git a/ios/Classes/Reachability.swift b/ios/Classes/Reachability.swift
new file mode 100644
index 0000000..2f69373
--- /dev/null
+++ b/ios/Classes/Reachability.swift
@@ -0,0 +1,405 @@
+/*
+Copyright (c) 2014, Ashley Mills
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+*/
+
+import SystemConfiguration
+import Foundation
+
+public enum ReachabilityError: Error {
+ case failedToCreateWithAddress(sockaddr, Int32)
+ case failedToCreateWithHostname(String, Int32)
+ case unableToSetCallback(Int32)
+ case unableToSetDispatchQueue(Int32)
+ case unableToGetFlags(Int32)
+}
+
+@available(*, unavailable, renamed: "Notification.Name.reachabilityChanged")
+public let ReachabilityChangedNotification = NSNotification.Name("ReachabilityChangedNotification")
+
+public extension Notification.Name {
+ static let reachabilityChanged = Notification.Name("reachabilityChanged")
+}
+
+public class Reachability {
+
+ public typealias NetworkReachable = (Reachability) -> ()
+ public typealias NetworkUnreachable = (Reachability) -> ()
+
+ @available(*, unavailable, renamed: "Connection")
+ public enum NetworkStatus: CustomStringConvertible {
+ case notReachable, reachableViaWiFi, reachableViaWWAN
+ public var description: String {
+ switch self {
+ case .reachableViaWWAN: return "Cellular"
+ case .reachableViaWiFi: return "WiFi"
+ case .notReachable: return "No Connection"
+ }
+ }
+ }
+
+ public enum Connection: CustomStringConvertible {
+ case unavailable, wifi, cellular
+ public var description: String {
+ switch self {
+ case .cellular: return "Cellular"
+ case .wifi: return "WiFi"
+ case .unavailable: return "No Connection"
+ }
+ }
+
+ @available(*, deprecated, renamed: "unavailable")
+ public static let none: Connection = .unavailable
+ }
+
+ public var whenReachable: NetworkReachable?
+ public var whenUnreachable: NetworkUnreachable?
+
+ @available(*, deprecated, renamed: "allowsCellularConnection")
+ public let reachableOnWWAN: Bool = true
+
+ /// Set to `false` to force Reachability.connection to .none when on cellular connection (default value `true`)
+ public var allowsCellularConnection: Bool
+
+ // The notification center on which "reachability changed" events are being posted
+ public var notificationCenter: NotificationCenter = NotificationCenter.default
+
+ @available(*, deprecated, renamed: "connection.description")
+ public var currentReachabilityString: String {
+ return "\(connection)"
+ }
+
+ @available(*, unavailable, renamed: "connection")
+ public var currentReachabilityStatus: Connection {
+ return connection
+ }
+
+ public var connection: Connection {
+ if flags == nil {
+ try? setReachabilityFlags()
+ }
+
+ switch flags?.connection {
+ case .unavailable?, nil: return .unavailable
+ case .cellular?: return allowsCellularConnection ? .cellular : .unavailable
+ case .wifi?: return .wifi
+ }
+ }
+
+ fileprivate var isRunningOnDevice: Bool = {
+ #if targetEnvironment(simulator)
+ return false
+ #else
+ return true
+ #endif
+ }()
+
+ fileprivate(set) var notifierRunning = false
+ fileprivate let reachabilityRef: SCNetworkReachability
+ fileprivate let reachabilitySerialQueue: DispatchQueue
+ fileprivate let notificationQueue: DispatchQueue?
+ fileprivate(set) var flags: SCNetworkReachabilityFlags? {
+ didSet {
+ guard flags != oldValue else { return }
+ notifyReachabilityChanged()
+ }
+ }
+
+ required public init(reachabilityRef: SCNetworkReachability,
+ queueQoS: DispatchQoS = .default,
+ targetQueue: DispatchQueue? = nil,
+ notificationQueue: DispatchQueue? = .main) {
+ self.allowsCellularConnection = true
+ self.reachabilityRef = reachabilityRef
+ self.reachabilitySerialQueue = DispatchQueue(label: "uk.co.ashleymills.reachability", qos: queueQoS, target: targetQueue)
+ self.notificationQueue = notificationQueue
+ }
+
+ public convenience init(hostname: String,
+ queueQoS: DispatchQoS = .default,
+ targetQueue: DispatchQueue? = nil,
+ notificationQueue: DispatchQueue? = .main) throws {
+ guard let ref = SCNetworkReachabilityCreateWithName(nil, hostname) else {
+ throw ReachabilityError.failedToCreateWithHostname(hostname, SCError())
+ }
+ self.init(reachabilityRef: ref, queueQoS: queueQoS, targetQueue: targetQueue, notificationQueue: notificationQueue)
+ }
+
+ public convenience init(queueQoS: DispatchQoS = .default,
+ targetQueue: DispatchQueue? = nil,
+ notificationQueue: DispatchQueue? = .main) throws {
+ var zeroAddress = sockaddr()
+ zeroAddress.sa_len = UInt8(MemoryLayout<sockaddr>.size)
+ zeroAddress.sa_family = sa_family_t(AF_INET)
+
+ guard let ref = SCNetworkReachabilityCreateWithAddress(nil, &zeroAddress) else {
+ throw ReachabilityError.failedToCreateWithAddress(zeroAddress, SCError())
+ }
+
+ self.init(reachabilityRef: ref, queueQoS: queueQoS, targetQueue: targetQueue, notificationQueue: notificationQueue)
+ }
+
+ deinit {
+ stopNotifier()
+ }
+}
+
+public extension Reachability {
+
+ // MARK: - *** Notifier methods ***
+ func startNotifier() throws {
+ guard !notifierRunning else { return }
+
+ let callback: SCNetworkReachabilityCallBack = { (reachability, flags, info) in
+ guard let info = info else { return }
+
+ // `weakifiedReachability` is guaranteed to exist by virtue of our
+ // retain/release callbacks which we provided to the `SCNetworkReachabilityContext`.
+ let weakifiedReachability = Unmanaged<ReachabilityWeakifier>.fromOpaque(info).takeUnretainedValue()
+
+ // The weak `reachability` _may_ no longer exist if the `Reachability`
+ // object has since been deallocated but a callback was already in flight.
+ weakifiedReachability.reachability?.flags = flags
+ }
+
+ let weakifiedReachability = ReachabilityWeakifier(reachability: self)
+ let opaqueWeakifiedReachability = Unmanaged<ReachabilityWeakifier>.passUnretained(weakifiedReachability).toOpaque()
+
+ var context = SCNetworkReachabilityContext(
+ version: 0,
+ info: UnsafeMutableRawPointer(opaqueWeakifiedReachability),
+ retain: { (info: UnsafeRawPointer) -> UnsafeRawPointer in
+ let unmanagedWeakifiedReachability = Unmanaged<ReachabilityWeakifier>.fromOpaque(info)
+ _ = unmanagedWeakifiedReachability.retain()
+ return UnsafeRawPointer(unmanagedWeakifiedReachability.toOpaque())
+ },
+ release: { (info: UnsafeRawPointer) -> Void in
+ let unmanagedWeakifiedReachability = Unmanaged<ReachabilityWeakifier>.fromOpaque(info)
+ unmanagedWeakifiedReachability.release()
+ },
+ copyDescription: { (info: UnsafeRawPointer) -> Unmanaged<CFString> in
+ let unmanagedWeakifiedReachability = Unmanaged<ReachabilityWeakifier>.fromOpaque(info)
+ let weakifiedReachability = unmanagedWeakifiedReachability.takeUnretainedValue()
+ let description = weakifiedReachability.reachability?.description ?? "nil"
+ return Unmanaged.passRetained(description as CFString)
+ }
+ )
+
+ if !SCNetworkReachabilitySetCallback(reachabilityRef, callback, &context) {
+ stopNotifier()
+ throw ReachabilityError.unableToSetCallback(SCError())
+ }
+
+ if !SCNetworkReachabilitySetDispatchQueue(reachabilityRef, reachabilitySerialQueue) {
+ stopNotifier()
+ throw ReachabilityError.unableToSetDispatchQueue(SCError())
+ }
+
+ // Perform an initial check
+ try setReachabilityFlags()
+
+ notifierRunning = true
+ }
+
+ func stopNotifier() {
+ defer { notifierRunning = false }
+
+ SCNetworkReachabilitySetCallback(reachabilityRef, nil, nil)
+ SCNetworkReachabilitySetDispatchQueue(reachabilityRef, nil)
+ }
+
+ // MARK: - *** Connection test methods ***
+ @available(*, deprecated, message: "Please use `connection != .none`")
+ var isReachable: Bool {
+ return connection != .unavailable
+ }
+
+ @available(*, deprecated, message: "Please use `connection == .cellular`")
+ var isReachableViaWWAN: Bool {
+ // Check we're not on the simulator, we're REACHABLE and check we're on WWAN
+ return connection == .cellular
+ }
+
+ @available(*, deprecated, message: "Please use `connection == .wifi`")
+ var isReachableViaWiFi: Bool {
+ return connection == .wifi
+ }
+
+ var description: String {
+ return flags?.description ?? "unavailable flags"
+ }
+}
+
+fileprivate extension Reachability {
+
+ func setReachabilityFlags() throws {
+ try reachabilitySerialQueue.sync { [unowned self] in
+ var flags = SCNetworkReachabilityFlags()
+ if !SCNetworkReachabilityGetFlags(self.reachabilityRef, &flags) {
+ self.stopNotifier()
+ throw ReachabilityError.unableToGetFlags(SCError())
+ }
+
+ self.flags = flags
+ }
+ }
+
+
+ func notifyReachabilityChanged() {
+ let notify = { [weak self] in
+ guard let self = self else { return }
+ self.connection != .unavailable ? self.whenReachable?(self) : self.whenUnreachable?(self)
+ self.notificationCenter.post(name: .reachabilityChanged, object: self)
+ }
+
+ // notify on the configured `notificationQueue`, or the caller's (i.e. `reachabilitySerialQueue`)
+ notificationQueue?.async(execute: notify) ?? notify()
+ }
+}
+
+extension SCNetworkReachabilityFlags {
+
+ typealias Connection = Reachability.Connection
+
+ var connection: Connection {
+ guard isReachableFlagSet else { return .unavailable }
+
+ // If we're reachable, but not on an iOS device (i.e. simulator), we must be on WiFi
+ #if targetEnvironment(simulator)
+ return .wifi
+ #else
+ var connection = Connection.unavailable
+
+ if !isConnectionRequiredFlagSet {
+ connection = .wifi
+ }
+
+ if isConnectionOnTrafficOrDemandFlagSet {
+ if !isInterventionRequiredFlagSet {
+ connection = .wifi
+ }
+ }
+
+ if isOnWWANFlagSet {
+ connection = .cellular
+ }
+
+ return connection
+ #endif
+ }
+
+ var isOnWWANFlagSet: Bool {
+ #if os(iOS)
+ return contains(.isWWAN)
+ #else
+ return false
+ #endif
+ }
+ var isReachableFlagSet: Bool {
+ return contains(.reachable)
+ }
+ var isConnectionRequiredFlagSet: Bool {
+ return contains(.connectionRequired)
+ }
+ var isInterventionRequiredFlagSet: Bool {
+ return contains(.interventionRequired)
+ }
+ var isConnectionOnTrafficFlagSet: Bool {
+ return contains(.connectionOnTraffic)
+ }
+ var isConnectionOnDemandFlagSet: Bool {
+ return contains(.connectionOnDemand)
+ }
+ var isConnectionOnTrafficOrDemandFlagSet: Bool {
+ return !intersection([.connectionOnTraffic, .connectionOnDemand]).isEmpty
+ }
+ var isTransientConnectionFlagSet: Bool {
+ return contains(.transientConnection)
+ }
+ var isLocalAddressFlagSet: Bool {
+ return contains(.isLocalAddress)
+ }
+ var isDirectFlagSet: Bool {
+ return contains(.isDirect)
+ }
+ var isConnectionRequiredAndTransientFlagSet: Bool {
+ return intersection([.connectionRequired, .transientConnection]) == [.connectionRequired, .transientConnection]
+ }
+
+ var description: String {
+ let W = isOnWWANFlagSet ? "W" : "-"
+ let R = isReachableFlagSet ? "R" : "-"
+ let c = isConnectionRequiredFlagSet ? "c" : "-"
+ let t = isTransientConnectionFlagSet ? "t" : "-"
+ let i = isInterventionRequiredFlagSet ? "i" : "-"
+ let C = isConnectionOnTrafficFlagSet ? "C" : "-"
+ let D = isConnectionOnDemandFlagSet ? "D" : "-"
+ let l = isLocalAddressFlagSet ? "l" : "-"
+ let d = isDirectFlagSet ? "d" : "-"
+
+ return "\(W)\(R) \(c)\(t)\(i)\(C)\(D)\(l)\(d)"
+ }
+}
+
+/**
+ `ReachabilityWeakifier` weakly wraps the `Reachability` class
+ in order to break retain cycles when interacting with CoreFoundation.
+
+ CoreFoundation callbacks expect a pair of retain/release whenever an
+ opaque `info` parameter is provided. These callbacks exist to guard
+ against memory management race conditions when invoking the callbacks.
+
+ #### Race Condition
+
+ If we passed `SCNetworkReachabilitySetCallback` a direct reference to our
+ `Reachability` class without also providing corresponding retain/release
+ callbacks, then a race condition can lead to crashes when:
+ - `Reachability` is deallocated on thread X
+ - A `SCNetworkReachability` callback(s) is already in flight on thread Y
+
+ #### Retain Cycle
+
+ If we pass `Reachability` to CoreFoundtion while also providing retain/
+ release callbacks, we would create a retain cycle once CoreFoundation
+ retains our `Reachability` class. This fixes the crashes and his how
+ CoreFoundation expects the API to be used, but doesn't play nicely with
+ Swift/ARC. This cycle would only be broken after manually calling
+ `stopNotifier()` — `deinit` would never be called.
+
+ #### ReachabilityWeakifier
+
+ By providing both retain/release callbacks and wrapping `Reachability` in
+ a weak wrapper, we:
+ - interact correctly with CoreFoundation, thereby avoiding a crash.
+ See "Memory Management Programming Guide for Core Foundation".
+ - don't alter the public API of `Reachability.swift` in any way
+ - still allow for automatic stopping of the notifier on `deinit`.
+ */
+private class ReachabilityWeakifier {
+ weak var reachability: Reachability?
+ init(reachability: Reachability) {
+ self.reachability = reachability
+ }
+}
diff --git a/pubspec.lock b/pubspec.lock
index dd4cb56..4ac96db 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -6,7 +6,7 @@ packages:
description:
name: async
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "2.10.0"
boolean_selector:
@@ -14,7 +14,7 @@ packages:
description:
name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "2.1.1"
characters:
@@ -22,7 +22,7 @@ packages:
description:
name: characters
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.2.1"
clock:
@@ -30,7 +30,7 @@ packages:
description:
name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.1.1"
collection:
@@ -38,7 +38,7 @@ packages:
description:
name: collection
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.17.0"
fake_async:
@@ -46,7 +46,7 @@ packages:
description:
name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.3.1"
flutter:
@@ -64,7 +64,7 @@ packages:
description:
name: js
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "0.6.5"
matcher:
@@ -72,7 +72,7 @@ packages:
description:
name: matcher
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "0.12.13"
material_color_utilities:
@@ -80,7 +80,7 @@ packages:
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "0.2.0"
meta:
@@ -88,7 +88,7 @@ packages:
description:
name: meta
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.8.0"
path:
@@ -96,7 +96,7 @@ packages:
description:
name: path
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.8.2"
sky_engine:
@@ -109,7 +109,7 @@ packages:
description:
name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.9.1"
stack_trace:
@@ -117,7 +117,7 @@ packages:
description:
name: stack_trace
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.11.0"
stream_channel:
@@ -125,7 +125,7 @@ packages:
description:
name: stream_channel
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "2.1.1"
string_scanner:
@@ -133,7 +133,7 @@ packages:
description:
name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.2.0"
term_glyph:
@@ -141,7 +141,7 @@ packages:
description:
name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "1.2.1"
test_api:
@@ -149,7 +149,7 @@ packages:
description:
name: test_api
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "0.4.16"
vector_math:
@@ -157,7 +157,7 @@ packages:
description:
name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
- url: "https://pub.flutter-io.cn"
+ url: "https://pub.dev"
source: hosted
version: "2.1.4"
sdks: