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

android/src/main/AndroidManifest.xml

@@ -2,4 +2,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-</manifest>
+</manifest>

android/src/main/java/io/openim/flutter_openim_sdk/manager/FriendshipManager.java

@@ -35,14 +35,16 @@ public class FriendshipManager extends BaseManager {
     public void getFriendApplicationListAsRecipient(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.getFriendApplicationListAsRecipient(
                 new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID")
+                value(methodCall, "operationID"),
+                jsonValue(methodCall, "req")
         );
     }
 
     public void getFriendApplicationListAsApplicant(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.getFriendApplicationListAsApplicant(
                 new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID")
+                value(methodCall, "operationID"),
+                jsonValue(methodCall, "req")
         );
     }
 
@@ -135,4 +137,12 @@ public class FriendshipManager extends BaseManager {
                 jsonValue(methodCall, "req")
         );
     }
+
+    public void getFriendApplicationUnhandledCount(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.getFriendApplicationUnhandledCount(
+                new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                jsonValue(methodCall, "req")
+        );
+    }
 }

android/src/main/java/io/openim/flutter_openim_sdk/manager/GroupManager.java

@@ -126,14 +126,16 @@ public class GroupManager extends BaseManager {
     public void getGroupApplicationListAsRecipient(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.getGroupApplicationListAsRecipient(
                 new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID")
+                value(methodCall, "operationID"),
+                jsonValue(methodCall, "req")
         );
     }
 
     public void getGroupApplicationListAsApplicant(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.getGroupApplicationListAsApplicant(
                 new OnBaseListener(result, methodCall),
-                value(methodCall, "operationID")
+                value(methodCall, "operationID"),
+                jsonValue(methodCall, "req")
         );
     }
 
@@ -240,4 +242,11 @@ public class GroupManager extends BaseManager {
                 jsonValue(methodCall, "userIDs")
         );
     }
+
+    public void getGroupApplicationUnhandledCount(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.getGroupApplicationUnhandledCount(new OnBaseListener(result, methodCall),
+                value(methodCall, "operationID"),
+                jsonValue(methodCall, "req")
+        );
+    }
 }

android/src/test/java/com/example/flutter_openim_sdk/FlutterOpenimSdkPluginTest.java

@@ -0,0 +1,33 @@
+package io.openim.flutter_openim_sdk;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import org.junit.Test;
+
+/**
+ * This demonstrates a simple unit test of the Java portion of this plugin's
+ * implementation.
+ *
+ * Once you have built the plugin's example app, you can run these tests from
+ * the command
+ * line by running `./gradlew testDebugUnitTest` in the `example/android/`
+ * directory, or
+ * you can run them directly from IDEs that support JUnit such as Android
+ * Studio.
+ */
+
+public class FlutterOpenimSdkPluginTest {
+  @Test
+  public void onMethodCall_getPlatformVersion_returnsExpectedValue() {
+    FlutterOpenimSdkPlugin plugin = new FlutterOpenimSdkPlugin();
+
+    final MethodCall call = new MethodCall("getPlatformVersion", null);
+    MethodChannel.Result mockResult = mock(MethodChannel.Result.class);
+    plugin.onMethodCall(call, mockResult);
+
+    verify(mockResult).success("Android " + android.os.Build.VERSION.RELEASE);
+  }
+}