Merge pull request #33 from jpush/dev

Dev

Author: KenChoi1992

README.md

@@ -15,13 +15,16 @@ react-native link
 #### Android
 
 
-安装完毕后，在 MainApplication 中加上 JMessagePackage 即可。
+安装完毕后，在 MainApplication 中加上 JMessagePackage 即可，JMessagePackage 有一个参数，设置是否弹出 toast。
 ```
+// 如果设置为 true，则不弹出 toast。
+private boolean shutdownToast = false;
+
 @Override
 protected List<ReactPackage> getPackages() {
     return Arrays.<ReactPackage>asList(
             new MainReactPackage(),
-            new JMessageReactPackage(),
+            new JMessageReactPackage(shutdownToast),
     );
 }
 ```

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

@@ -148,16 +148,19 @@ public static WritableMap toJSObject(Message msg) {
                     break;
                 case image:
                     result.putString(Constant.TYPE, Constant.IMAGE);
-                    result.putString(Constant.THUMB_PATH, ((ImageContent) content).getLocalThumbnailPath());
+                    ImageContent imageContent = (ImageContent) content;
+                    result.putString(Constant.THUMB_PATH, imageContent.getLocalThumbnailPath() + "." + imageContent.getFormat());
                     break;
                 case voice:
                     result.putString(Constant.TYPE, Constant.VOICE);
-                    result.putString(Constant.PATH, ((VoiceContent) content).getLocalPath());
+                    VoiceContent voiceContent = (VoiceContent) content;
+                    result.putString(Constant.PATH, voiceContent.getLocalPath() + "." + voiceContent.getFormat());
                     result.putInt(Constant.DURATION, ((VoiceContent) content).getDuration());
                     break;
                 case file:
                     result.putString(Constant.TYPE, Constant.FILE);
-                    result.putString(Constant.FILE_NAME, ((FileContent) content).getFileName());
+                    FileContent fileContent = (FileContent) content;
+                    result.putString(Constant.FILE_NAME, fileContent.getFileName() + "." + fileContent.getFormat());
                     break;
                 case custom:
                     result.putString(Constant.TYPE, Constant.CUSTOM);

example/android/app/app.iml

@@ -84,10 +84,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
@@ -104,10 +107,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="com.google.code.gson:gson:2.8.0@jar" level="project" />
     <orderEntry type="library" name="com.squareup.okhttp3:okhttp-ws:3.4.1@jar" level="project" />
-    <orderEntry type="library" name="com.github.w446108264:AndroidEmoji-1.0.0" level="project" />
     <orderEntry type="library" name="com.google.android:flexbox-0.2.5" level="project" />
     <orderEntry type="library" name="com.facebook.fresco:imagepipeline-base-1.0.1" level="project" />
-    <orderEntry type="library" name="cn.jiguang.imui:chatinput-0.5.6" 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="com.android.support:support-compat-25.3.1" level="project" />
@@ -116,10 +118,9 @@
     <orderEntry type="library" name="com.facebook.react:react-native-0.44.2" level="project" />
     <orderEntry type="library" name="com.squareup.okhttp3:okhttp-urlconnection:3.4.1@jar" level="project" />
     <orderEntry type="library" name="__local_aars__:/Users/caiyg/Desktop/github/jmessage-react-plugin/example/node_modules/jcore-react-native/android/libs/jcore-android-1.1.7.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="cn.jiguang.imui:messagelist-0.5.8" level="project" />
     <orderEntry type="library" name="com.facebook.soloader:soloader-0.1.0" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-utils-25.3.1" level="project" />
-    <orderEntry type="library" name="com.github.w446108264:XhsEmoticonsKeyboard-2.0.4" level="project" />
-    <orderEntry type="library" name="cn.jiguang.imui:messagelist-0.5.5" level="project" />
     <orderEntry type="library" name="com.android.support:support-v4-25.3.1" level="project" />
     <orderEntry type="library" name="com.facebook.fresco:fresco-1.0.1" level="project" />
     <orderEntry type="library" name="com.android.support:support-fragment-25.3.1" level="project" />

example/android/build.gradle

@@ -29,6 +29,5 @@ allprojects {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
         }
-        maven { url "https://jitpack.io" }
     }
 }