Merge pull request #135 from skill20/master

新增发送视频接口 sendVoiceMessage

Author: skill20

CHANGELOG.md

@@ -1,3 +1,5 @@
+## 2.1.4
++新增：新增发送视频接口 sendVoiceMessage
 ## 2.1.2
 +升级：升级 android jcore 2.8.2
 ## 2.1.0

README.md

@@ -17,7 +17,7 @@ dependencies:
 
 //pub.dev 集成
 dependencies:
-  jmessage_flutter: 2.1.2
+  jmessage_flutter: 2.1.4
 ```
 
 

android/src/main/java/com/jiguang/jmessageflutter/JmessageFlutterPlugin.java

@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.text.TextUtils;
@@ -42,6 +43,7 @@
 import cn.jpush.im.android.api.content.LocationContent;
 import cn.jpush.im.android.api.content.MessageContent;
 import cn.jpush.im.android.api.content.TextContent;
+import cn.jpush.im.android.api.content.VideoContent;
 import cn.jpush.im.android.api.content.VoiceContent;
 import cn.jpush.im.android.api.enums.ContentType;
 import cn.jpush.im.android.api.enums.PlatformType;
@@ -308,6 +310,8 @@ public void onMethodCall(MethodCall call, Result result) {
             getMessageReceiptDetails(call, result);
         } else if (call.method.equals("setMessageHaveRead")) {
             setMessageHaveRead(call, result);
+        } else if (call.method.equals("sendVideoMessage")) {
+            sendVideoMessage(call, result);
         } else {
             result.notImplemented();
         }
@@ -1045,6 +1049,79 @@ private void sendFileMessage(MethodCall call, Result result) {
         }
     }
 
+    private void sendVideoMessage(MethodCall call, Result result) {
+        HashMap<String, Object> map = call.arguments();
+
+        int duration;
+        String thumbImagePath = "", thumbFormat = "", videoPath, videoFileName = "";
+        Map<String, String> extras = null;
+        MessageSendingOptions options = null;
+        Conversation conversation;
+
+        try {
+            JSONObject params = new JSONObject(map);
+
+            conversation = JMessageUtils.createConversation(params);
+            if (conversation == null) {
+                handleResult(ERR_CODE_CONVERSATION, ERR_MSG_CONVERSATION, result);
+                return;
+            }
+
+            videoPath = params.getString("videoPath");
+
+            if (params.has("thumbFormat")) {
+                thumbFormat = params.getString("thumbFormat");
+            }
+
+            if (params.has("thumbImagePath")) {
+                thumbImagePath = params.getString("thumbImagePath");
+            }
+
+            if (params.has("duration")) {
+                duration = params.getInt("duration");
+            } else {
+                MediaPlayer mediaPlayer = MediaPlayer.create(mContext, Uri.parse(videoPath));
+                duration = mediaPlayer.getDuration() / 1000;
+                mediaPlayer.release();
+            }
+
+            if (params.has("videoFileName")) {
+                videoFileName = params.getString("videoFileName");
+            }
+
+            if (params.has("extras")) {
+                extras = fromJson(params.getJSONObject("extras"));
+            }
+
+            if (params.has("messageSendingOptions")) {
+                options = toMessageSendingOptions(params.getJSONObject("messageSendingOptions"));
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+            handleResult(ERR_CODE_PARAMETER, ERR_MSG_PARAMETER, result);
+            return;
+        }
+        try {
+            File videoFile = getFile(videoPath);
+
+            Bitmap bitmap = null;
+            if (!TextUtils.isEmpty(thumbImagePath)) {
+                bitmap = BitmapFactory.decodeFile(thumbImagePath);
+            }
+
+            VideoContent content = new VideoContent(bitmap, thumbFormat, videoFile, videoFileName, duration);
+            if (extras != null) {
+                content.setExtras(extras);
+            }
+
+            sendMessage(conversation, content, options, result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            handleResult(ERR_CODE_FILE, ERR_MSG_FILE, result);
+        }
+
+    }
+
     private void sendLocationMessage(MethodCall call, Result result) {
         HashMap<String, Object> map = call.arguments();
 

example/.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"image_picker","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.7.5+2\\\\","dependencies":[]},{"name":"jmessage_flutter","path":"D:\\\\Workspace\\\\flutter\\\\jmessage-flutter-plugin\\\\","dependencies":[]},{"name":"jpush_flutter","path":"D:\\\\Workspace\\\\flutter\\\\jpush-flutter-plugin\\\\","dependencies":[]},{"name":"modal_progress_hud_nsn","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\modal_progress_hud_nsn-0.1.0-nullsafety-1\\\\","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_plugin_android_lifecycle-2.0.1\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.7.5+2\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"jmessage_flutter","path":"D:\\\\Workspace\\\\flutter\\\\jmessage-flutter-plugin\\\\","dependencies":[]},{"name":"jpush_flutter","path":"D:\\\\Workspace\\\\flutter\\\\jpush-flutter-plugin\\\\","dependencies":[]},{"name":"modal_progress_hud_nsn","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\modal_progress_hud_nsn-0.1.0-nullsafety-1\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"image_picker_for_web","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker_for_web-2.0.0\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle","image_picker_for_web"]},{"name":"image_picker_for_web","dependencies":[]},{"name":"jmessage_flutter","dependencies":[]},{"name":"jpush_flutter","dependencies":[]},{"name":"modal_progress_hud_nsn","dependencies":[]}],"date_created":"2021-05-24 10:32:10.964211","version":"2.2.0"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"image_picker","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.7.5+2\\\\","dependencies":[]},{"name":"jmessage_flutter","path":"D:\\\\Workspace\\\\flutter\\\\jmessage-flutter-plugin\\\\","dependencies":[]},{"name":"modal_progress_hud_nsn","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\modal_progress_hud_nsn-0.1.0-nullsafety-1\\\\","dependencies":[]},{"name":"video_thumbnail","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_thumbnail-0.3.3\\\\","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_plugin_android_lifecycle-2.0.1\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker-0.7.5+2\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"jmessage_flutter","path":"D:\\\\Workspace\\\\flutter\\\\jmessage-flutter-plugin\\\\","dependencies":[]},{"name":"modal_progress_hud_nsn","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\modal_progress_hud_nsn-0.1.0-nullsafety-1\\\\","dependencies":[]},{"name":"video_thumbnail","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\video_thumbnail-0.3.3\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"image_picker_for_web","path":"D:\\\\Workspace\\\\android\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\image_picker_for_web-2.0.0\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle","image_picker_for_web"]},{"name":"image_picker_for_web","dependencies":[]},{"name":"jmessage_flutter","dependencies":[]},{"name":"modal_progress_hud_nsn","dependencies":[]},{"name":"video_thumbnail","dependencies":[]}],"date_created":"2021-06-01 11:58:00.043626","version":"2.2.0"}

example/lib/main.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -7,6 +9,7 @@ import 'package:jmessage_flutter_example/conversation_manage_view.dart';
 import 'package:jmessage_flutter_example/group_manage_view.dart';
 import 'package:modal_progress_hud_nsn/modal_progress_hud_nsn.dart';
 import 'package:platform/platform.dart';
+import 'package:video_thumbnail/video_thumbnail.dart';
 
 const String kMockAppkey = "e58a32cb3e4469ebf31867e5"; //'你自己应用的 AppKey';
 const String kMockUserName = '0001';
@@ -261,6 +264,48 @@ class _MyHomePageState extends State<MyHomePage> {
     });
   }
 
+  void demoSendVideoMessage() async {
+    print(flutter_log + "demoSendVideoMessage " + usernameTextEC2.text);
+
+    setState(() {
+      _loading = true;
+    });
+
+    if (usernameTextEC2.text == "") {
+      setState(() {
+        _loading = false;
+        _result = "【发消息】对方 username 不能为空";
+      });
+      return;
+    }
+    String username = usernameTextEC2.text;
+
+    PickedFile? selectVideoPath = await ImagePicker().getVideo(
+        source: ImageSource.gallery, maxDuration: const Duration(seconds: 10));
+
+    String? thumbnailPath = await VideoThumbnail.thumbnailFile(
+      video: selectVideoPath!.path,
+      imageFormat: ImageFormat.PNG,
+      maxWidth: 128,
+      // specify the width of the thumbnail, let the height auto-scaled to keep the source aspect ratio
+      quality: 25,
+    );
+
+    // print('selectVideoPath ======${selectVideoPath.path},thumbnailPath = $thumbnailPath');
+    JMSingle type = JMSingle.fromJson({"username": username});
+    JMVideoMessage msg = await jmessage.sendVideoMessage(
+        type: type,
+        duration: null,
+        thumbFormat: "",
+        videoFileName: "",
+        thumbImagePath: thumbnailPath,
+        videoPath: selectVideoPath.path);
+    setState(() {
+      _loading = false;
+      _result = "【视频消息】${msg.toJson()}";
+    });
+  }
+
   static final String chatRoomMsgListenerID =
       "chatRoomMsgListenerID"; //监听聊天室消息的监听id
   static final String receiveMsgListenerID = "receiveMsgListenerID"; //监听消息的监听id
@@ -1125,6 +1170,9 @@ class _MyHomePageState extends State<MyHomePage> {
               mainAxisAlignment: MainAxisAlignment.center,
               children: <Widget>[
                 new Text(" "),
+                new CustomButton(
+                    title: "发送视频消息", onPressed: demoSendVideoMessage),
+                new Text(" "),
                 new CustomButton(
                     title: "会话管理界面",
                     onPressed: () {

example/pubspec.yaml

@@ -22,6 +22,7 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.3
   image_picker: ^0.7.5+2
+  video_thumbnail: ^0.3.3
 
 dev_dependencies:
   flutter_test:

lib/jmessage_flutter.dart

@@ -457,7 +457,7 @@ class JmessageFlutter {
   }
 
   Future<JMUserInfo?> getMyInfo() async {
-    Map userJson = await _channel.invokeMethod('getMyInfo');
+    Map? userJson = await _channel.invokeMethod('getMyInfo');
     if (userJson == null) {
       return null;
     } else {
@@ -805,6 +805,47 @@ class JmessageFlutter {
     return res;
   }
 
+  Future<JMVideoMessage> sendVideoMessage({
+    @required dynamic type,
+
+    /// (JMSingle | JMGroup | JMChatRoom)
+    String? thumbImagePath,
+    String? thumbFormat,
+    @required String? videoPath,
+    String? videoFileName,
+    int? duration,
+    JMMessageSendOptions? sendOption,
+    Map<dynamic, dynamic>? extras,
+  }) async {
+    Map param = type.toJson();
+    Map optionMap = {};
+    if (sendOption != null) {
+      optionMap = {
+        'messageSendingOptions': sendOption.toJson()
+          ..removeWhere((key, value) => value == null)
+      };
+    }
+
+    if (extras != null) {
+      param..addAll({'extras': extras});
+    }
+
+    param
+      ..addAll(optionMap)
+      ..addAll({
+        'thumbImagePath': thumbImagePath,
+        'thumbFormat': thumbFormat,
+        'videoPath': videoPath,
+        'videoFileName': videoFileName,
+        'duration': duration
+      });
+
+    Map resMap = await _channel.invokeMethod(
+        'sendVideoMessage', param..removeWhere((key, value) => value == null));
+    var res = JMNormalMessage.generateMessageFromJson(resMap);
+    return res;
+  }
+
   /**
    * 消息撤回
    *
@@ -2033,33 +2074,37 @@ class JMNormalMessage {
     switch (type) {
       case JMMessageType.text:
         return JMTextMessage.fromJson(json);
-        break;
       case JMMessageType.image:
         return JMImageMessage.fromJson(json);
-        break;
       case JMMessageType.voice:
         return JMVoiceMessage.fromJson(json);
-        break;
       case JMMessageType.location:
         return JMLocationMessage.fromJson(json);
-        break;
       case JMMessageType.file:
         return JMFileMessage.fromJson(json);
-        break;
       case JMMessageType.custom:
         return JMCustomMessage.fromJson(json);
-        break;
       case JMMessageType.event:
         return JMEventMessage.fromJson(json);
-        break;
       case JMMessageType.prompt:
         return JMPromptMessage.fromJson(json);
-        break;
+      case JMMessageType.video:
+        return JMPromptMessage.fromJson(json);
     }
   }
 }
 
-enum JMMessageType { text, image, voice, file, custom, location, event, prompt }
+enum JMMessageType {
+  text,
+  image,
+  voice,
+  file,
+  custom,
+  location,
+  event,
+  prompt,
+  video
+}
 
 class JMTextMessage extends JMNormalMessage {
   final JMMessageType type = JMMessageType.text;
@@ -2146,6 +2191,33 @@ class JMLocationMessage extends JMNormalMessage {
         super.fromJson(json);
 }
 
+class JMVideoMessage extends JMNormalMessage {
+  String videoPath; // 视频地址
+  String thumbFormat; //视频缩略图格式名
+  int duration; // 视频时长
+  String thumbImagePath; // 视频缩略图
+  String videoFileName; // 视频名称
+
+  Map toJson() {
+    var json = super.toJson();
+    json['thumbImagePath'] = thumbImagePath;
+    json['videoPath'] = videoPath;
+    json['duration'] = duration;
+    json['thumbImagePath'] = thumbImagePath;
+    json['videoFileName'] = videoFileName;
+
+    return json;
+  }
+
+  JMVideoMessage.fromJson(Map<dynamic, dynamic> json)
+      : videoPath = json['videoPath'],
+        thumbFormat = json['thumbFormat'],
+        duration = json['duration'],
+        thumbImagePath = json['thumbImagePath'],
+        videoFileName = json['videoFileName'],
+        super.fromJson(json);
+}
+
 class JMCustomMessage extends JMNormalMessage {
   Map<dynamic, dynamic> customObject; // 自定义键值对
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: jmessage_flutter
 description: JIGUANG officially supported JMessage Flutter plugin (Android & iOS). 极光推送官方支持的 Flutter 插件（Android & iOS）(https://www.jiguang.cn).
-version: 2.1.2
+version: 2.1.4
 homepage: https://www.jiguang.cn
 
 environment: