Merge pull request #86 from JoshLipan/dev

JoshLipan · web-flow · commit bba0de39f9f4 · 2018-08-30T17:24:35.000+08:00
Dev
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -85,6 +85,12 @@
         </receiver>
 
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+        
+        <!-- Required since JMessage 2.7.0 SDK 核心功能-->
+        <provider
+            android:name="cn.jpush.im.android.helpers.ipc.IMProvider"
+            android:authorities="${applicationId}.IMProvider"
+            android:exported="false" />
     </application>
 
 </manifest>
diff --git a/android/libs/jmessage-sdk-android-2.6.1.jar b/android/libs/jmessage-sdk-android-2.6.1.jar
diff --git a/android/libs/jmessage-sdk-android-2.7.0.jar b/android/libs/jmessage-sdk-android-2.7.0.jar
diff --git a/android/src/io/jchat/android/JMessageModule.java b/android/src/io/jchat/android/JMessageModule.java
@@ -379,7 +379,7 @@ public void sendMessage(ReadableMap map, final Callback success, final Callback
                     options.setCustomNotificationEnabled(optionMap.getBoolean("isCustomNotificationEnabled"));
                 }
                 if (optionMap.hasKey("notificationTitle")) {
-                    options.setNotificationText(optionMap.getString("notificationTitle"));
+                    options.setNotificationTitle(optionMap.getString("notificationTitle"));
                 }
                 if (optionMap.hasKey("notificationText")) {
                     options.setNotificationText(optionMap.getString("notificationText"));
@@ -1125,7 +1125,7 @@ public void downloadVoiceFile(ReadableMap map, final Callback success, final Cal
                 mJMessageUtils.handleError(fail, ERR_CODE_MESSAGE, ERR_MSG_MESSAGE);
                 return;
             }
-            if (msg.getContentType() != ContentType.image) {
+            if (msg.getContentType() != ContentType.voice) {
                 mJMessageUtils.handleError(fail, ERR_CODE_MESSAGE, "Wrong message type");
                 return;
             }
diff --git a/example/android/.project b/example/android/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>TestReactJChat</name>
+	<comment>Project TestReactJChat created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/example/android/.settings/org.eclipse.buildship.core.prefs b/example/android/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/example/android/app/.classpath b/example/android/app/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/example/android/app/.project b/example/android/app/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/example/android/app/.settings/org.eclipse.buildship.core.prefs b/example/android/app/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+#Tue May 22 13:17:58 CST 2018
+connection.project.dir=..
diff --git a/example/android/app/app.iml b/example/android/app/app.iml
@@ -84,59 +84,40 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 25 Platform (2)" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 25 Platform" 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="com.github.bumptech.glide:disklrucache:4.6.1@jar" level="project" />
+    <orderEntry type="library" name="cn.jiguang.imui:chatinput-0.8.3" 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" />
     <orderEntry type="library" name="com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
     <orderEntry type="library" name="com.google.code.findbugs:jsr305:3.0.0@jar" level="project" />
     <orderEntry type="library" name="com.squareup.okhttp3:okhttp-urlconnection:3.6.0@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.bumptech.glide:glide-4.6.1" level="project" />
     <orderEntry type="library" name="com.squareup.okio:okio:1.13.0@jar" level="project" />
-    <orderEntry type="library" name="com.android.support:support-v4-25.3.1" level="project" />
-    <orderEntry type="library" name="com.android.support:support-fragment-25.3.1" level="project" />
+    <orderEntry type="library" name="cn.jiguang.imui:messagelist-0.7.4" level="project" />
     <orderEntry type="library" name="com.facebook.fresco:fresco-1.3.0" level="project" />
-    <orderEntry type="library" name="com.android.support:support-media-compat-25.3.1" level="project" />
     <orderEntry type="library" name="com.facebook.fresco:imagepipeline-1.3.0" level="project" />
-    <orderEntry type="library" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
     <orderEntry type="library" name="com.squareup.okhttp3:okhttp:3.6.0@jar" level="project" />
     <orderEntry type="library" name="com.facebook.fresco:fbcore-1.3.0" level="project" />
-    <orderEntry type="library" name="com.android.support:transition-25.3.1" level="project" />
-    <orderEntry type="library" name="com.android.support:design-25.3.1" level="project" />
     <orderEntry type="library" name="com.facebook.fresco:drawee-1.3.0" level="project" />
-    <orderEntry type="library" name="com.facebook.react:react-native-0.51.0" level="project" />
+    <orderEntry type="library" name="com.github.bumptech.glide:annotations:4.6.1@jar" level="project" />
+    <orderEntry type="library" name="com.facebook.react:react-native-0.51.1" level="project" />
     <orderEntry type="library" name="com.facebook.fbui.textlayoutbuilder:staticlayout-proxy:1.0@jar" level="project" />
-    <orderEntry type="library" name="com.android.support:appcompat-v7-25.3.1" 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.8.jar:unspecified@jar" 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.5.0.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/josh/Desktop/workspace/Jiguang/JMessage/jmessage-react-plugin/example/node_modules/jmessage-react-plugin/android/libs/jmessage-sdk-android-2.7.0.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="com.github.bumptech.glide:gifdecoder-4.6.1" level="project" />
     <orderEntry type="library" name="org.greenrobot:eventbus:3.0.0@jar" level="project" />
-    <orderEntry type="library" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
     <orderEntry type="library" name="com.facebook.fbui.textlayoutbuilder:textlayoutbuilder-1.0.0" level="project" />
-    <orderEntry type="library" name="com.android.support:recyclerview-v7-25.3.1" level="project" />
-    <orderEntry type="library" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/josh/Desktop/workspace/Jiguang/JMessage/jmessage-react-plugin/example/node_modules/jcore-react-native/android/libs/jcore-android-1.2.3.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="org.webkit:android-jsc-r174650" level="project" />
-    <orderEntry type="library" name="com.github.bumptech.glide:glide:3.7.0@jar" level="project" />
+    <orderEntry type="library" name="pub.devrel:easypermissions-1.0.1" level="project" />
     <orderEntry type="module" module-name="jcore-react-native" />
     <orderEntry type="module" module-name="react-native-fs" />
     <orderEntry type="module" module-name="aurora-imui-react-native" />
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -85,8 +85,8 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         applicationId "com.sample.applicaiton"
@@ -136,9 +136,10 @@ dependencies {
     compile project(':jmessage-react-plugin')
     compile project(':jcore-react-native')
     compile project(':aurora-imui-react-native')
-    compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.android.support:appcompat-v7:25.3.1"
-    compile "com.facebook.react:react-native:+"  // From node_modules
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:27.1.0'
+    compile 'com.facebook.react:react-native:+'
+    // From node_modules
 }
 
 // Run this once to be able to run the application with BUCK
diff --git a/example/android/app/src/main/java/com/sample/application/MainApplication.java b/example/android/app/src/main/java/com/sample/application/MainApplication.java
@@ -4,6 +4,8 @@
 import android.util.Log;
 
 import com.facebook.react.ReactApplication;
+import com.rnfs.RNFSPackage;
+import io.jchat.android.JMessageReactPackage;
 
 import cn.jiguang.imui.messagelist.ReactIMUIPackage;
 import cn.jpush.im.android.api.JMessageClient;
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -12,6 +12,7 @@ buildscript {
         maven {
             url 'https://dl.google.com/dl/android/maven2/'
         }
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
@@ -29,5 +30,6 @@ allprojects {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
         }
+        google()
     }
 }
diff --git a/example/package-lock.json b/example/package-lock.json
diff --git a/example/package.json b/example/package.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ public void sendMessage(ReadableMap map, final Callback success, final Callback`
`379`	`379`	`options.setCustomNotificationEnabled(optionMap.getBoolean("isCustomNotificationEnabled"));`
`380`	`380`	`}`
`381`	`381`	`if (optionMap.hasKey("notificationTitle")) {`
`382`		`- options.setNotificationText(optionMap.getString("notificationTitle"));`
	`382`	`+ options.setNotificationTitle(optionMap.getString("notificationTitle"));`
`383`	`383`	`}`
`384`	`384`	`if (optionMap.hasKey("notificationText")) {`
`385`	`385`	`options.setNotificationText(optionMap.getString("notificationText"));`
`@@ -1125,7 +1125,7 @@ public void downloadVoiceFile(ReadableMap map, final Callback success, final Cal`
`1125`	`1125`	`mJMessageUtils.handleError(fail, ERR_CODE_MESSAGE, ERR_MSG_MESSAGE);`
`1126`	`1126`	`return;`
`1127`	`1127`	`}`
`1128`		`- if (msg.getContentType() != ContentType.image) {`
	`1128`	`+ if (msg.getContentType() != ContentType.voice) {`
`1129`	`1129`	`mJMessageUtils.handleError(fail, ERR_CODE_MESSAGE, "Wrong message type");`
`1130`	`1130`	`return;`
`1131`	`1131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+connection.project.dir=`
	`2`	`+eclipse.preferences.version=1`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#Tue May 22 13:17:58 CST 2018`
	`2`	`+connection.project.dir=..`