Merge pull request #492 from easemob/flutter2_dev

Flutter2 dev

Author: dujiepeng

CHANGELOG.md

@@ -1,6 +1,10 @@
 ## NEXT
 
-## 3.8.3+7
+## 3.8.3+9
+
+- 将设置推送相关操作从EMPushConfigs中移到EMPushManager中；
+
+## 3.8.3+8
 
 - 修复ios使用token登录失败；
 - 修改Login方法和Logout方法返回值；

README.md

@@ -29,7 +29,7 @@ Demo中使用的音视频是针对声网音视频封装的[EaseCallKit](https://
 
    ```dart
    dependencies:
-   im_flutter_sdk: ^3.8.3+7
+   im_flutter_sdk: ^3.8.3+9
    ```
 
 2. 执行`flutter pub get`;
@@ -1558,7 +1558,7 @@ try{
 
 ```dart
 try{
-  EMImPushConfig pushManager = await EMClient.getInstance.pushManager.getImPushConfigFromServer();
+  EMPushConfigs pushConfigs = await EMClient.getInstance.pushManager.getPushConfigsFromServer();
 } on EMError catch(e) {
   print('操作失败，原因是: $e');
 }
@@ -1568,7 +1568,7 @@ try{
 
 ```dart
 try{
-  EMImPushConfig pushConfig = await EMClient.getInstance.pushManager.getImPushConfig();
+  EMPushConfigs pushConfigs = await EMClient.getInstance.pushManager.getPushConfigsFromCache();
 } on EMError catch(e) {
   print('操作失败，原因是: $e');
 }
@@ -1578,21 +1578,21 @@ try{
 
 ```dart
 try{
-  await pushConfig.setPushStyle(EMImPushStyle.Simple);
+  await EMClient.getInstance.pushManager.updatePushDisplayStyle(DisplayStyle.Simple);
 } on EMError catch(e) {
   print('操作失败，原因是: $e');
 }
 ```
 
-> `EMImPushStyle`是收推送时样式，目前有两种样式：    
+> `DisplayStyle`是收推送时样式，目前有两种样式：    
 > `Simple`显示“您有一条新消息”;     
 > `Summary`显示推送详情;  
 
 #### 设置消息免打扰
 
 ```dart
 try{
-  await pushConfig.setNoDisturb(true, 10, 22);
+  await EMClient.getInstance.pushManager.disableOfflinePush(10, 22);
 } on EMError catch(e) {
   print('操作失败，原因是: $e');
 }
@@ -1604,7 +1604,7 @@ try{
 
 ```dart
 try{
-  await pushConfig.setNoDisturb(false);
+  await EMClient.getInstance.pushManager.enableOfflinePush();
 } on EMError catch(e) {
   print('操作失败，原因是: $e');
 }
@@ -1614,7 +1614,7 @@ try{
 
 ```dart
 try{
-  await pushConfig.setGroupToDisturb(groupId, true);
+  await EMClient.getInstance.pushManager.updatePushServiceForGroup(groupId, false);
 } on EMError catch(e) {
   print('操作失败，原因是: $e');
 }
@@ -1624,7 +1624,7 @@ try{
 
 ```dart
 try{
-  List groupIdsList = await pushConfig.noDisturbGroupsFromServer();
+  List<String> groupIdsList = await EMClient.getInstance.pushManager.getNoPushGroupsFromCache();
 } on EMError catch(e) {
   print('操作失败，原因是: $e');
 }

android/src/main/java/com/easemob/im_flutter_sdk/EMHelper.java

@@ -732,8 +732,8 @@ static EMImageMessageBody imageBodyFromJson(JSONObject json) throws JSONExceptio
         body.setThumbnailUrl(json.getString("thumbnailRemotePath"));
         body.setThumbnailSecret(json.getString("thumbnailSecret"));
         body.setFileLength(json.getInt("fileSize"));
-        int width = json.getInt("height");
-        int height = json.getInt("width");
+        int width = json.getInt("width");
+        int height = json.getInt("height");
         body.setThumbnailSize(width, height);
         body.setSendOriginalImage(json.getBoolean("sendOriginalImage"));
 
@@ -770,8 +770,8 @@ static EMVideoMessageBody videoBodyFromJson(JSONObject json) throws JSONExceptio
         }
         body.setThumbnailSecret(json.getString("thumbnailSecret"));
         body.setFileName(json.getString("displayName"));
-        int width = json.getInt("height");
-        int height = json.getInt("width");
+        int width = json.getInt("width");
+        int height = json.getInt("height");
         body.setThumbnailSize(width, height);
         body.setRemoteUrl(json.getString("remotePath"));
         body.setDownloadStatus(downloadStatusFromInt(json.getInt("fileStatus")));

android/src/main/java/com/easemob/im_flutter_sdk/EMPushManagerWrapper.java

@@ -8,6 +8,7 @@
 import com.hyphenate.chat.EMPushManager.DisplayStyle;
 import com.hyphenate.exceptions.HyphenateException;
 
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -58,6 +59,15 @@ else if(EMSDKMethod.updateHMSPushToken.equals(call.method)){
             else if(EMSDKMethod.updateFCMPushToken.equals(call.method)){
                 updateFCMPushToken(param, call.method, result);
             }
+            else if (EMSDKMethod.enableOfflinePush.equals(call.method)) {
+                enableOfflinePush(param, call.method, result);
+            }
+            else if (EMSDKMethod.disableOfflinePush.equals(call.method)){
+                disableOfflinePush(param, call.method, result);
+            }
+            else if (EMSDKMethod.getNoPushGroups.equals(call.method)) {
+                getNoPushGroups(param, call.method, result);
+            }
             else {
                 super.onMethodCall(call, result);
             }
@@ -112,21 +122,57 @@ private void imPushNoDisturb(JSONObject params, String channelName,  Result resu
         });
     }
 
+    private void enableOfflinePush(JSONObject params, String channelName, Result result) throws JSONException
+    {
+        asyncRunnable(()-> {
+            try {
+                EMClient.getInstance().pushManager().enableOfflinePush();
+                onSuccess(result, channelName, null);
+            } catch(HyphenateException e) {
+                onError(result, e);
+            }
+        });
+    }
+
+    private void disableOfflinePush(JSONObject params, String channelName, Result result) throws JSONException
+    {
+        int startTime = params.getInt("start");
+        int endTime = params.getInt("end");
+        asyncRunnable(()-> {
+            try {
+                EMClient.getInstance().pushManager().disableOfflinePush(startTime, endTime);
+                onSuccess(result, channelName, null);
+            } catch(HyphenateException e) {
+                onError(result, e);
+            }
+        });
+    }
+
+    private void getNoPushGroups(JSONObject params, String channelName, Result result)  {
+        asyncRunnable(()-> {
+            List<String> groups = EMClient.getInstance().pushManager().getNoPushGroups();
+            onSuccess(result, channelName, groups);
+        });
+
+    }
+
     private void updateImPushStyle(JSONObject params, String channelName,  Result result) throws JSONException {
         DisplayStyle style = params.getInt("pushStyle") == 0 ? DisplayStyle.SimpleBanner : DisplayStyle.MessageSummary;
         EMClient.getInstance().pushManager().asyncUpdatePushDisplayStyle(style, new EMWrapperCallBack(result, channelName, true));
     }
 
     private void updateGroupPushService(JSONObject params, String channelName,  Result result) throws JSONException {
-        String groupId = params.getString("group_id");
-        boolean enablePush = params.getBoolean("noDisturb");
+        JSONArray groupIds = params.getJSONArray("group_ids");
+        boolean noPush = params.getBoolean("noPush");
         List<String> groupList = new ArrayList<>();
-        groupList.add(groupId);
+        for (int i = 0; i < groupIds.length(); i++) {
+            String groupId = groupIds.getString(i);
+            groupList.add(groupId);
+        }
         asyncRunnable(()-> {
             try {
-                EMClient.getInstance().pushManager().updatePushServiceForGroup(groupList, !enablePush);
-                EMGroup group = EMClient.getInstance().groupManager().getGroup(groupId);
-                onSuccess(result, channelName, EMGroupHelper.toJson(group));
+                EMClient.getInstance().pushManager().updatePushServiceForGroup(groupList, noPush);
+                onSuccess(result, channelName, null);
             } catch(HyphenateException e) {
                 onError(result, e);
             }

android/src/main/java/com/easemob/im_flutter_sdk/EMSDKMethod.java

@@ -200,6 +200,9 @@ public class EMSDKMethod {
     static final String updatePushNickname = "updatePushNickname";
     static final String updateHMSPushToken = "updateHMSPushToken";
     static final String updateFCMPushToken = "updateFCMPushToken";
+    static final String enableOfflinePush = "enableOfflinePush";
+    static final String disableOfflinePush = "disableOfflinePush";
+    static final String getNoPushGroups = "getNoPushGroups";
 
     /// ImPushConfig
     static final String imPushNoDisturb = "imPushNoDisturb";

example/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

example/android/app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="easeim_flutter_demo"
         android:theme="@style/NormalTheme"
         android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">

example/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.31'
     repositories {
         google()
         mavenCentral()

example/lib/main.dart

@@ -30,6 +30,7 @@ void initSDK() async {
   var options = EMOptions(appKey: 'easemob-demo#easeim');
   options.deleteMessagesAsExitGroup = false;
   options.deleteMessagesAsExitChatRoom = false;
+  options.autoAcceptGroupInvitation = true;
   options.debugModel = true;
   options.enableAPNs("EaseIM_APNS_Product");
 

example/lib/pages/contacts/contacts_page.dart

@@ -249,6 +249,7 @@ class ContactsPageState extends State<ContactsPage>
         _contactList.addAll(list);
       }
     } on EMError {
+      _contactList.clear();
       SmartDialog.showToast('获取失败');
       _loadLocalContacts(count);
     } finally {