From 062ceea09169334be662f7e9903fcfae96f3249a Mon Sep 17 00:00:00 2001
From: zher52 <zher52@aliyun.com>
Date: Sun, 26 Dec 2021 19:03:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90android=E7=AB=AF=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E5=8A=9F=E8=83=BD=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml  | 17 +++++++++++------
 www/trtc.js |  8 ++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/plugin.xml b/plugin.xml
index 4434e55..7ba6d9a 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -247,17 +247,23 @@
             </activity>
         </config-file>
 
-        <source-file src="src/android/Trtc.java" target-dir="com/chuwa/cordova/trtc"/>
-
-        <source-file src="src/android/java/com/example/basic/TRTCBaseActivity.java" target-dir="android/java/com/example/basic"/>
+        <source-file src="src/android/java/com/tencent/trtc/TrtcPlugin.java" target-dir="com/tencent/trtcc"/>
+        <source-file src="src/android/java/com/tencent/trtc/TRTCBaseActivity.java" target-dir="com/tencent/trtc"/>
+        <source-file src="src/android/java/com/tencent/trtc/MessageObject.java" target-dir="com/tencent/trtc"/>
+        <source-file src="src/android/java/com/tencent/trtc/CustomVideoView.java" target-dir="com/tencent/trtc"/>
+        <source-file src="src/android/java/com/tencent/trtc/CordovaEventKit.java" target-dir="com/tencent/trtc"/>
 
         <source-file src="src/android/java/com/tencent/trtc/videocall/BuildConfig.java" target-dir="com/tencent/trtc/videocall"/>
-        <source-file src="src/android/java/com/tencent/trtc/videocall/FloatingView.java" target-dir="com/tencent/trtc/videocall"/>
+        <source-file src="src/android/java/com/tencent/trtc/videocall/UserInfo.java" target-dir="com/tencent/trtc/videocall"/>
         <source-file src="src/android/java/com/tencent/trtc/videocall/VideoCallingActivity.java" target-dir="com/tencent/trtc/videocall"/>
         <source-file src="src/android/java/com/tencent/trtc/videocall/VideoCallingEnterActivity.java" target-dir="com/tencent/trtc/videocall"/>
 
         <source-file src="src/android/java/com/tencent/trtc/debug/Constant.java" target-dir="com/tencent/trtc/debug"/>
 
+        <source-file src="src/android/java/com/tencent/trtc/event/Events.java" target-dir="com/tencent/trtc/event"/>
+        <source-file src="src/android/java/com/tencent/trtc/event/Listener.java" target-dir="com/tencent/trtc/event"/>
+
+
         <resource-file src="src/android/res/drawable/videocall_background.xml" target="res/drawable/videocall_background.xml"/>
         <resource-file src="src/android/res/drawable/common_button_bg.xml" target="res/drawable/common_button_bg.xml"/>
         <resource-file src="src/android/res/drawable/common_edit_bg.xml" target="res/drawable/common_edit_bg.xml"/>
@@ -267,8 +273,7 @@
 
         <resource-file src="src/android/res/layout/videocall_activit_enter.xml" target="res/layout/videocall_activit_enter.xml"/>
         <resource-file src="src/android/res/layout/videocall_activity_calling.xml" target="res/layout/videocall_activity_calling.xml"/>
-        <resource-file src="src/android/res/layout/videocall_popup_layout.xml" target="res/layout/videocall_popup_layout.xml"/>
-        <resource-file src="src/android/res/layout/videocall_view_floating_default.xml" target="res/layout/videocall_view_floating_default.xml"/>
+        <resource-file src="src/android/res/layout/custom_video_view_layout.xml" target="res/layout/custom_video_view_layout.xml"/>
 
         <resource-file src="src/android/res/mipmap-xxhdpi/videocall_float_logo.png" target="res/mipmap-xxhdpi/videocall_float_logo.png"/>
         <resource-file src="src/android/res/mipmap-xxhdpi/videocall_home.png" target="res/mipmap-xxhdpi/videocall_home.png"/>
diff --git a/www/trtc.js b/www/trtc.js
index fd27ab1..809c9ed 100644
--- a/www/trtc.js
+++ b/www/trtc.js
@@ -6,8 +6,12 @@ Trtc.prototype.joinChannel = function(arg, success, error) {
     exec(success, error, 'Trtc', 'joinChannel', [arg]);
 };
 
-Trtc.prototype.showCreatePage = function(success, error) {
-    exec(success, error, 'Trtc', 'showCreatePage', []);
+Trtc.prototype.userInfoChange = function(userInfo,success, error) {
+    exec(success, error, 'Trtc', 'userInfoChange', [userInfo]);
+}
+
+Trtc.prototype.fireEvent = function(event,extra) {
+    cordova.fireDocumentEvent("trtc."+event, extra);
 }
 
 module.exports = new Trtc();