feat: support native 1.4.+

AgoraIO · Aug 25, 2021 · 3fd1b66 · 3fd1b66
1 parent 11e4837
commit 3fd1b66
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 10 deletions.
diff --git a/agora-react-native-rtm.podspec b/agora-react-native-rtm.podspec
@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency "React"
-  s.dependency 'AgoraRtm_iOS', "1.2.2"
+  s.dependency 'AgoraRtm_iOS', "1.4.8"
 end
diff --git a/android/build.gradle b/android/build.gradle
@@ -3,8 +3,8 @@ buildscript {
   def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['Agora_kotlinVersion']
 
   repositories {
+    mavenCentral()
     google()
-    jcenter()
   }
 
   dependencies {
@@ -16,7 +16,6 @@ buildscript {
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['Agora_' + name]
@@ -54,8 +53,8 @@ android {
 
 repositories {
   mavenCentral()
-  jcenter()
   google()
+  maven { url 'https://www.jitpack.io' }
 
   def found = false
   def defaultDir = null
@@ -128,7 +127,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
-  api "io.agora.rtm:rtm-sdk:1.2.2"
+  api 'com.github.agorabuilder:rtm-sdk:1.4.7'
+
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 }
diff --git a/android/src/main/java/io/agora/agora_rtm/AgoraRTMModule.java b/android/src/main/java/io/agora/agora_rtm/AgoraRTMModule.java
@@ -33,6 +33,9 @@
 import io.agora.rtm.RtmChannelMember;
 import io.agora.rtm.RtmClient;
 import io.agora.rtm.RtmClientListener;
+import io.agora.rtm.RtmFileMessage;
+import io.agora.rtm.RtmImageMessage;
+import io.agora.rtm.RtmMediaOperationProgress;
 import io.agora.rtm.RtmMessage;
 
 public class AgoraRTMModule extends ReactContextBaseJavaModule
@@ -475,6 +478,26 @@ public void onMessageReceived(RtmMessage rtmMessage, String peerId) {
     sendEvent(AgoraRTMConstants.MessageReceived, ret);
   }
 
+  @Override
+  public void onImageMessageReceivedFromPeer(RtmImageMessage rtmImageMessage, String s) {
+
+  }
+
+  @Override
+  public void onFileMessageReceivedFromPeer(RtmFileMessage rtmFileMessage, String s) {
+
+  }
+
+  @Override
+  public void onMediaUploadingProgress(RtmMediaOperationProgress rtmMediaOperationProgress, long l) {
+
+  }
+
+  @Override
+  public void onMediaDownloadingProgress(RtmMediaOperationProgress rtmMediaOperationProgress, long l) {
+
+  }
+
   @Override
   public void onTokenExpired() {
     sendEvent(AgoraRTMConstants.TokenExpired, null);
@@ -513,6 +536,16 @@ public void onMessageReceived(RtmMessage rtmMessage, RtmChannelMember rtmChannel
     sendEvent(AgoraRTMConstants.ChannelMessageReceived, ret);
   }
 
+  @Override
+  public void onImageMessageReceived(RtmImageMessage rtmImageMessage, RtmChannelMember rtmChannelMember) {
+
+  }
+
+  @Override
+  public void onFileMessageReceived(RtmFileMessage rtmFileMessage, RtmChannelMember rtmChannelMember) {
+
+  }
+
   @Override
   public void onAttributesUpdated(List<RtmChannelAttribute> list) {
     WritableArray ret = Arguments.createArray();

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -14,7 +14,6 @@ buildscript {
   }
   dependencies {
     classpath("com.android.tools.build:gradle:3.4.0")
-
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
   }
@@ -23,11 +22,13 @@ buildscript {
 allprojects {
   repositories {
     mavenLocal()
-    google()
-    jcenter()
     maven {
       // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-      url "$rootDir/../node_modules/react-native/android"
+      url("$rootDir/../node_modules/react-native/android")
     }
+
+    google()
+    jcenter()
+    maven { url 'https://www.jitpack.io' }
   }
 }
diff --git a/example/ios/chatsapp.xcodeproj/project.pbxproj b/example/ios/chatsapp.xcodeproj/project.pbxproj
@@ -698,6 +698,7 @@
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				EA57D39D201BE4041A35FF6B /* [CP] Copy Pods Resources */,
+				F0B670EF661F7C1450AF9045 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -1235,6 +1236,24 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-chatsapp/Pods-chatsapp-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		F0B670EF661F7C1450AF9045 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-chatsapp/Pods-chatsapp-frameworks.sh",
+				"${PODS_ROOT}/AgoraRtm_iOS/AgoraRtmKit.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AgoraRtmKit.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-chatsapp/Pods-chatsapp-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */