Merge pull request #127 from JoshLipan/dev

Dev

Author: JoshLipan

android/build.gradle

@@ -1,12 +1,16 @@
 apply plugin: 'com.android.library'
 
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 android {
-    compileSdkVersion 23
-    buildToolsVersion "25.0.2"
+    compileSdkVersion safeExtGet('compileSdkVersion', 27)
+    buildToolsVersion safeExtGet('buildToolsVersion', '26.0.2')
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 22
+        minSdkVersion safeExtGet('minSdkVersion', 16)
+        targetSdkVersion safeExtGet('targetSdkVersion', 27)
         versionCode 1
         versionName "1.0"
     }
@@ -31,6 +35,6 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile "com.facebook.react:react-native:+"
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.facebook.react:react-native:+'
 }

android/src/io/jchat/android/JMessageModule.java

@@ -1870,7 +1870,7 @@ public void processApplyJoinGroup(final ReadableMap map, final Callback success,
             List<GroupApprovalEvent> groupApprovalEventList = new ArrayList<>();
 
             for (int i = 0; i < array.size(); i++) {
-                GroupApprovalEvent groupApprovalEvent = groupApprovalEventHashMap.get(array.getString(i));
+                GroupApprovalEvent groupApprovalEvent = groupApprovalEventHashMap.remove(array.getString(i));
                 if (groupApprovalEvent == null) {
                     mJMessageUtils.handleError(fail, ERR_CODE_PARAMETER,
                             ERR_MSG_PARAMETER + ": can't get event through " + array.getString(i));
@@ -2065,7 +2065,9 @@ public void onEventMainThread(ChatRoomMessageEvent event) {
 
     public void onEvent(GroupApprovalEvent event) {
         Log.d(TAG, "GroupApprovalEvent, event: " + event);
-        groupApprovalEventHashMap.put(event.getEventId() + "", event);
+        GroupApprovalEvent save_event = new GroupApprovalEvent();
+        save_event = event;
+        groupApprovalEventHashMap.put(event.getEventId() + "", save_event);
         GroupApprovalEvent.Type type = event.getType();
         final WritableMap map = Arguments.createMap();
         map.putString(Constant.EVENT_ID, event.getEventId() + "");

example/android/app/src/main/java/com/sample/application/MainApplication.java

@@ -5,6 +5,8 @@
 
 import com.facebook.react.ReactApplication;
 import com.rnfs.RNFSPackage;
+
+import cn.jiguang.imui.messagelist.BuildConfig;
 import io.jchat.android.JMessageReactPackage;
 
 import cn.jiguang.imui.messagelist.ReactIMUIPackage;

example/app/routes/Chat/index.js

@@ -325,7 +325,7 @@ export default class Chat extends Component {
       eventMsg.msgId = message.msgId
       eventMsg.msgType = "event"
       eventMsg.text = "撤回的消息"
-      AuroraIController.updateMessage(message)
+      AuroraIController.updateMessage(eventMsg);
     }, (error) => {
 
     })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmessage-react-plugin",
-  "version": "2.4.8",
+  "version": "2.5.0",
   "description": "a jmessage plugin for react native application",
   "main": "index.js",
   "repository": {