diff --git a/.gitignore b/.gitignore index aa724b7..4c63549 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,7 @@ .externalNativeBuild .cxx local.properties +.idea +.idea/* +.gitignore +.idea/* diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 89935b5..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml deleted file mode 100644 index f8051a6..0000000 --- a/.idea/migrations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index c2b3ddc..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/other.xml b/.idea/other.xml deleted file mode 100644 index 22069ff..0000000 --- a/.idea/other.xml +++ /dev/null @@ -1,549 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/example/mrtcdemo/MainActivity.kt b/app/src/main/java/com/example/mrtcdemo/MainActivity.kt index c35d877..fc4f109 100644 --- a/app/src/main/java/com/example/mrtcdemo/MainActivity.kt +++ b/app/src/main/java/com/example/mrtcdemo/MainActivity.kt @@ -187,7 +187,6 @@ class MainActivity : ComponentActivity() { domain = domain_ mPort = mPort_ } - var roomListener = RoomListener() roomListener.setOnDorySDKListener(sdkListener_) //MRTCEngine.setSDKLogDirectory("/Users/wangjiyu/StudioProjects/Log") @@ -201,15 +200,13 @@ class MainActivity : ComponentActivity() { mAppId = applicationId_ mAppSecrectKey = mAppSecrectKey_ } + MRTCEngine.getDefault().registerListener(MRTCAdapter.MRTCListenerType.TYPE_LISTENER_ROOM) + MRTCEngine.getDefault().registerListener(MRTCAdapter.MRTCListenerType.TYPE_LISTENER_CONSUMER) var ret2 = MRTCEngine.getDefault().joinRoom(loginConfig) if (ret2 != 0) { println("MRTCDEBUG RTCContext::instance().joinRoom() failed, ret:$ret2") return false } - - MRTCEngine.getDefault().registerListener(MRTCAdapter.MRTCListenerType.TYPE_LISTENER_ROOM) - MRTCEngine.getDefault().registerListener(MRTCAdapter.MRTCListenerType.TYPE_LISTENER_CONSUMER) - MRTCEngine.getDefault().registerReceivedMicAudioFrameListener(audioListener_) println("MRTCDEBUG init succ") return true