Merge pull request #533 from easemob/dev_3.9.7.1

update 3.9.7.1

Author: dujiepeng

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## NEXT
 
+## 3.9.7+1
+
+修复:
+  1. 修复 安卓 fcm send id偶现为空的问题；
+  2. 修复 安卓 `SilentModeResult` expireTs 为空的问题；
+
 ## 3.9.7
 
 新增特性:

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

@@ -44,7 +44,7 @@ public class EMClientWrapper extends EMWrapper implements MethodCallHandler {
     public EMProgressManager progressManager;
     private EMMultiDeviceListener multiDeviceListener;
     private EMConnectionListener connectionListener;
-    public String fcmKey;
+
 
     EMClientWrapper(FlutterPlugin.FlutterPluginBinding flutterPluginBinding, String channelName) {
         super(flutterPluginBinding, channelName);
@@ -282,11 +282,10 @@ private void init(JSONObject param, String channelName, Result result) throws JS
         EMOptions options = EMOptionsHelper.fromJson(param, this.context);
         EMClient.getInstance().init(this.context, options);
         EMClient.getInstance().setDebugMode(param.getBoolean("debugModel"));
-        fcmKey = EMClient.getInstance().getOptions().getPushConfig().getFcmSenderId();
+
         bindingManagers();
         registerEaseListener();
         onSuccess(result, channelName, null);
-
     }
 
     private void renewToken(JSONObject param, String channelName, Result result) throws JSONException {

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

@@ -1362,9 +1362,7 @@ static Map<String, Object> toJson(EMSilentModeTime modeTime) {
 class EMSilentModeResultHelper {
     static Map<String, Object> toJson(EMSilentModeResult modeResult) {
         Map<String, Object> data = new HashMap<>();
-        if (modeResult.getExpireTimestamp() != 0) {
-            data.put("expireTs", modeResult.getExpireTimestamp());
-        }
+        data.put("expireTs", modeResult.getExpireTimestamp());
         if (modeResult.getConversationId() != null) {
             data.put("conversationId", modeResult.getConversationId());
         }

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

@@ -235,7 +235,7 @@ private void updateHMSPushToken(JSONObject params, String channelName,  Result r
 
     private void updateFCMPushToken(JSONObject params, String channelName,  Result result) throws JSONException {
         String token = params.getString("token");
-        String fcmKey = EMClientWrapper.getInstance().fcmKey;
+        String fcmKey = EMClient.getInstance().getOptions().getPushConfig().getFcmSenderId();
         EMClient.getInstance().pushManager().bindDeviceToken(fcmKey, token, new EMWrapperCallBack(result, channelName, null));
     }
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: im_flutter_sdk
 description: Integrate the Chat SDK to enjoy the global IM services with high reliability, ultra-low latency, and high concurrency.
-version: 3.9.7
+version: 3.9.7+1
 homepage: https://www.easemob.com/product/im
 
 environment: