fix bug and add localPath property

Author: KenChoi

android/src/io/jchat/android/Constant.java

@@ -65,6 +65,7 @@ public class Constant {
     public static final String CUSTOM = "custom";
     public static final String EXTRAS = "extras";
     public static final String THUMB_PATH = "thumbPath";
+    public static final String LOCAL_PATH = "localPath";
     public static final String PATH = "path";
     public static final String DURATION = "duration";
     public static final String LONGITUDE = "longitude";

android/src/io/jchat/android/utils/JMessageUtils.java

@@ -44,8 +44,10 @@ public Conversation getConversation(ReadableMap map) {
             String appKey = "";
             if (map.hasKey(Constant.APP_KEY)) {
                 appKey = map.getString(Constant.APP_KEY);
+                conversation = Conversation.createSingleConversation(username, appKey);
+            } else {
+                conversation = Conversation.createSingleConversation(username);
             }
-            conversation = Conversation.createSingleConversation(username, appKey);
         } else {
             String groupId = map.getString(Constant.GROUP_ID);
             conversation = Conversation.createGroupConversation(Long.parseLong(groupId));
@@ -54,7 +56,7 @@ public Conversation getConversation(ReadableMap map) {
     }
 
     public void sendMessage(ReadableMap map, MessageContent content,
-                                   final Callback success, final Callback fail) {
+                            final Callback success, final Callback fail) {
         if (map.hasKey(Constant.EXTRAS)) {
             content.setExtras(ResultUtils.fromMap(map.getMap(Constant.EXTRAS)));
         }

android/src/io/jchat/android/utils/ResultUtils.java

@@ -2,6 +2,8 @@
 
 
 
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.text.TextUtils;
 
 import com.facebook.react.bridge.Arguments;
@@ -17,6 +19,10 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -152,7 +158,22 @@ public static WritableMap toJSObject(Message msg) {
                 case image:
                     result.putString(Constant.TYPE, Constant.IMAGE);
                     ImageContent imageContent = (ImageContent) content;
-                    result.putString(Constant.THUMB_PATH, imageContent.getLocalThumbnailPath() + "." + imageContent.getFormat());
+                    // jmessage did not add file extension, so save to local.
+                    File file = new File(imageContent.getLocalThumbnailPath() + ".png");
+                    FileOutputStream fos = new FileOutputStream(file);
+                    BitmapFactory.Options opts = new BitmapFactory.Options();
+                    opts.inJustDecodeBounds = false;
+                    opts.inSampleSize = 1;
+                    Bitmap bitmap = BitmapFactory.decodeFile(imageContent.getLocalThumbnailPath(), opts);
+                    try {
+                        bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
+                        fos.flush();
+                        fos.close();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    result.putString(Constant.THUMB_PATH, file.getAbsolutePath());
+                    result.putString(Constant.LOCAL_PATH, imageContent.getLocalPath());
                     break;
                 case voice:
                     result.putString(Constant.TYPE, Constant.VOICE);

document/Models.md

@@ -104,6 +104,7 @@ from: UserInfo,                // 消息发送者对象
 target: UserInfo / GroupInfo,  // 消息接收者对象
 extras: object,                // 附带的键值对
 thumbPath: string              // 图片的缩略图路径
+localPath: string              // 图片本地路径
 ```
 
 ### VoiceMessage

example/android/app/app.iml

@@ -101,17 +101,16 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform (1)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="com.facebook.fresco:imagepipeline-okhttp3-1.3.0" level="project" />
     <orderEntry type="library" name="com.google.code.gson:gson:2.8.0@jar" level="project" />
     <orderEntry type="library" name="com.google.android:flexbox-0.2.5" level="project" />
-    <orderEntry type="library" name="cn.jiguang.imui:chatinput-0.6.2" level="project" />
     <orderEntry type="library" name="javax.inject:javax.inject:1@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-ui-25.3.1" level="project" />
+    <orderEntry type="library" name="cn.jiguang.imui:chatinput-0.6.3" level="project" />
     <orderEntry type="library" name="com.android.support:support-compat-25.3.1" level="project" />
     <orderEntry type="library" name="com.facebook.fresco:imagepipeline-base-1.3.0" level="project" />
     <orderEntry type="library" name="__local_aars__:/Users/caiyg/Desktop/github/jmessage-react-plugin/example/node_modules/jmessage-react-plugin/android/libs/jmessage-android_v2.4.1.jar:unspecified@jar" level="project" />

example/app/routes/Chat/index.js

@@ -231,7 +231,8 @@ export default class Chat extends Component {
     if (this.state.inputLayoutHeight != size.height) {
       this.setState({
         inputLayoutHeight: size.height,
-        inputViewLayout: { width: size.width, height: size.height }
+        inputViewLayout: { width: size.width, height: size.height },
+        messageListLayout: { flex:1, width: window.width, margin: 0 }
       })
     }
   }
@@ -246,6 +247,9 @@ export default class Chat extends Component {
   resetMenu() {
     if (Platform.OS === "android") {
       this.refs["ChatInput"].showMenu(false)
+      this.setState({
+        messageListLayout: { flex: 1, width: window.width, margin: 0 },
+      })
     } else {
       this.setState({
         inputViewLayout: { width: window.width, height: 86 }
@@ -267,8 +271,7 @@ export default class Chat extends Component {
 
   onTouchEditText = () => {
     console.log("scroll to bottom")
-    AuroraIController.scrollToBottom(true);
-    // this.refs["ChatInput"].showMenu(false)
+    this.refs["ChatInput"].showMenu(false)
     this.setState({
       inputViewLayout: { width: window.width, height: this.state.inputLayoutHeight }
     })
@@ -347,6 +350,7 @@ export default class Chat extends Component {
   }
 
   onTakePicture = (mediaPath) => {
+    console.log("onTakePicture, path: " + mediaPath)
     var message = this.getNormalMessage()
     message.messageType = "image"
     message.path = mediaPath
@@ -536,7 +540,7 @@ export default class Chat extends Component {
           onTouchEditText={this.onTouchEditText}
           onFullScreen={this.onFullScreen}
           onRecoverScreen={this.onRecoverScreen}
-          onSizeChanged={this.onInputViewSizeChange}
+          onSizeChange={this.onInputViewSizeChange}
         />
       </View>
     );

example/package.json

@@ -5,7 +5,7 @@
     "start": "node node_modules/react-native/local-cli/cli.js start"
   },
   "dependencies": {
-    "aurora-imui-react-native": "^0.6.0",
+    "aurora-imui-react-native": "^0.6.9",
     "jcore-react-native": "^1.2.3",
     "jmessage-react-plugin": "^2.1.3",
     "react": "^16.0.0",