Merge commit '0a175bb8b1eb8d4a40c66107ca77a2ff33212bf9' into pre_merge

# Conflicts:
#	.idea/libraries/Dart_SDK.xml
#	android/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/src/main/AndroidManifest.xml
#	example/android/app/build.gradle
#	example/android/build.gradle
#	example/android/settings.gradle
#	example/lib/main.dart
#	example/pubspec.lock
#	ios/flutter_openim_sdk.podspec
#	lib/src/manager/im_conversation_manager.dart
#	lib/src/manager/im_friendship_manager.dart
#	lib/src/models/notification_info.dart

ios/flutter_openim_sdk.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'flutter_openim_sdk'
-  s.version          = '0.0.13'
+  s.version          = '0.0.14'
   s.summary          = 'A new Flutter project.'
   s.description      = <<-DESC
 A new Flutter project.
@@ -19,7 +19,7 @@ A new Flutter project.
 
   #s.ios.vendored_frameworks = 'frameworks/*.xcframework'
   #s.vendored_frameworks = 'frameworks/*.xcframework'
-  s.dependency 'openim_sdk_core_ios','0.13.0'
+  s.dependency 'openim_sdk_core_ios','0.14.0'
   s.static_framework = true
   s.library = 'resolv'
 
@@ -30,4 +30,6 @@ A new Flutter project.
   # Flutter.framework does not contain a i386 slice.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386 arm64' }
   s.swift_version = '5.0'
+
+  s.resource_bundles = {'flutter_openim_sdk_privacy' => ['Resources/PrivacyInfo.xcprivacy']}
 end