From 458aafa665b18fa156bbeb21026c03f46e5610b4 Mon Sep 17 00:00:00 2001
From: zher52 <zher52@aliyun.com>
Date: Fri, 24 Dec 2021 16:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=92=E4=BB=B6=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96app=E5=90=8D=E7=A7=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugin.xml                            | 143 +++++++++++++++++++-------
 src/android/res/values-en/strings.xml |  55 ----------
 src/android/res/values-en/styles.xml  |  13 ---
 src/android/res/values/colors.xml     |  14 ---
 src/android/res/values/strings.xml    |  55 ----------
 src/android/res/values/styles.xml     |  13 ---
 6 files changed, 103 insertions(+), 190 deletions(-)
 delete mode 100644 src/android/res/values-en/strings.xml
 delete mode 100644 src/android/res/values-en/styles.xml
 delete mode 100644 src/android/res/values/colors.xml
 delete mode 100644 src/android/res/values/strings.xml
 delete mode 100644 src/android/res/values/styles.xml

diff --git a/plugin.xml b/plugin.xml
index 907e5db..6b6da95 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -160,29 +160,102 @@
         </config-file>
 
         <config-file target="res/values/strings.xml" parent="/resources">
-            <string name="trtc_app_id">$APP_ID</string>
-            <string name="str_enter_tips">腾讯视频通话</string>
-            <string name="str_room_title">房间名</string>
-            <string name="str_room_id">房间ID</string>
-            <string name="str_create_btn">创建房间</string>
-            <string name="str_switch_camera">翻转</string>
-            <string name="str_chat_tab">聊天</string>
-            <string name="str_wb_tab">白板</string>
-            <string name="msg_title">消息</string>
-            <string name="str_input_tips">输入文字内容</string>
-            <string name="str_beauty">美颜</string>
-            <string name="str_log">日志</string>
-            <string name="str_voice">声音</string>
-            <string name="str_room_id_tips">输入房间号</string>
-            <string name="str_enter_room_btn">进入房间</string>
-            <string name="str_role">配置</string>
-            <string name="str_feedback">反馈</string>
-            <string name="str_set_role">请选择要配置的分辨率</string>
-            <string name="str_chat">聊天</string>
-            <string name="str_set_problem">请选择反馈类型</string>
-            <string name="str_problem_other">请输入具体问题描述</string>
-            <string name="str_feedback_ret">非常感谢您的反馈</string>
-            <string name="str_login_success">登录成功</string>
+<!--            <string name="trtc_app_id">$APP_ID</string>-->
+<!--            <string name="str_enter_tips">腾讯视频通话</string>-->
+<!--            <string name="str_room_title">房间名</string>-->
+<!--            <string name="str_room_id">房间ID</string>-->
+<!--            <string name="str_create_btn">创建房间</string>-->
+<!--            <string name="str_switch_camera">翻转</string>-->
+<!--            <string name="str_chat_tab">聊天</string>-->
+<!--            <string name="str_wb_tab">白板</string>-->
+<!--            <string name="msg_title">消息</string>-->
+<!--            <string name="str_input_tips">输入文字内容</string>-->
+<!--            <string name="str_beauty">美颜</string>-->
+<!--            <string name="str_log">日志</string>-->
+<!--            <string name="str_voice">声音</string>-->
+<!--            <string name="str_room_id_tips">输入房间号</string>-->
+<!--            <string name="str_enter_room_btn">进入房间</string>-->
+<!--            <string name="str_role">配置</string>-->
+<!--            <string name="str_feedback">反馈</string>-->
+<!--            <string name="str_set_role">请选择要配置的分辨率</string>-->
+<!--            <string name="str_chat">聊天</string>-->
+<!--            <string name="str_set_problem">请选择反馈类型</string>-->
+<!--            <string name="str_problem_other">请输入具体问题描述</string>-->
+<!--            <string name="str_feedback_ret">非常感谢您的反馈</string>-->
+<!--            <string name="str_login_success">登录成功</string>-->
+            <string name="common_please_input_roomid_and_userid">用户没有允许需要的权限，加入通话失败</string>
+
+
+            <string name="main_trtc_base_funciton">基础功能</string>
+            <string name="main_item_aduio_call">语音通话</string>
+            <string name="main_item_aduio_call_desc">双人/多人语音通话、包含静音/免提等功能</string>
+            <string name="main_item_video_call">视频通话</string>
+            <string name="main_item_video_call_desc">双人/多人视频通话、包含静音/免提等功能</string>
+            <string name="main_item_live">视频互动直播</string>
+            <string name="main_item_voice_chat_room">语音互动直播</string>
+            <string name="main_item_screen_share">录屏直播</string>
+            <string name="main_item_screen_share_desc">直播过程中分享屏幕，适用于在线教育，游戏直播等场景</string>
+
+            <string name="main_trtc_advanced">进阶功能</string>
+            <string name="main_item_string_room_id">字符串房间号</string>
+            <string name="main_rtrc_set_video_quality">画质设定</string>
+            <string name="main_rtrc_set_audio_quality">音质设定</string>
+            <string name="main_rerc_render_params">渲染控制</string>
+            <string name="main_item_speed_test">网络测速</string>
+            <string name="main_item_pushcdn">CDN发布</string>
+            <string name="main_trtc_custom_camera">自定义视频采集&amp;渲染</string>
+            <string name="main_rtrc_set_audio_effect">设置音效</string>
+            <string name="main_trtc_set_bgm">设置背景音乐</string>
+            <string name="main_trtc_local_video_share">本地视频分享</string>
+            <string name="main_item_local_record">本地媒体录制</string>
+            <string name="main_item_join_multiple_room">加入多个房间</string>
+            <string name="main_item_sei_message">收发SEI消息</string>
+            <string name="main_item_switch_room">快速切换房间</string>
+            <string name="main_trtc_connect_other_room_pk">跨房PK</string>
+            <string name="main_item_third_beauty">第三方美颜</string>
+
+
+            <string name="videocall_title">TRTC 视频通话示例</string>
+            <string name="videocall_room_input_error_tip">"房间号和用户名不能为空"</string>
+            <string name="videocall_video_item">视频选项</string>
+            <string name="videocall_audio_item">音频选项</string>
+            <string name="videocall_user_back_camera">使用后置摄像头</string>
+            <string name="videocall_user_front_camera">使用前置摄像头</string>
+            <string name="videocall_open_camera">打开摄像头</string>
+            <string name="videocall_close_camera">关闭摄像头</string>
+            <string name="videocall_mute_audio">打开麦克风</string>
+            <string name="videocall_close_mute_audio">关闭麦克风</string>
+            <string name="videocall_use_speaker">使用扬声器</string>
+            <string name="videocall_use_receiver">使用听筒</string>
+            <string name="videocall_enter_room">进入房间</string>
+            <string name="videocall_please_input_userid">请输入用户名(必填项)</string>
+            <string name="videocall_please_input_roomid">请输入房间号(必填项)</string>
+            <string name="videocall_roomid">房间号:</string>
+        </config-file>
+
+        <config-file target="res/values/colors.xml" parent="/resources">
+            <color name="rl_main_bg">#1B1B1B</color>
+            <color name="videocall_green_bg">#00A66B</color>
+            <color name="videocall_title_bg">#B7B7B7</color>
+            <color name="common_green_bg">#34c759</color>
+            <color name="common_edit_solid">#EFEFEF</color>
+            <color name="common_edit_stroke">#FFFFFF</color>
+            <color name="common_radio_select">#34c759</color>
+            <color name="common_raido_select_off">#999999</color>
+            <color name="colorPrimary">#008577</color>
+            <color name="colorPrimaryDark">#00574B</color>
+            <color name="colorAccent">#D81B60</color>
+        </config-file>
+        <config-file target="res/values/styles.xml" parent="/resources">
+            <!-- Base application theme. -->
+            <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+                <!-- Customize your theme here. -->
+                <item name="colorPrimary">@color/colorPrimary</item>
+                <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+                <item name="colorAccent">@color/colorAccent</item>
+                <item name="android:windowActionBar">false</item>
+                <item name="android:windowNoTitle">true</item>
+            </style>
         </config-file>
 
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
@@ -203,22 +276,22 @@
             </activity>
         </config-file>
 
-        <source-file src="src/android/Trtc.java" target-dir="src/com/chuwa/cordova/trtc"/>
+        <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="src/android/java/com/example/basic"/>
+                     target-dir="android/java/com/example/basic"/>
 
         <source-file src="src/android/java/com/tencent/trtc/videocall/BuildConfig.java"
-                     target-dir="src/com/tencent/trtc/videocall"/>
+                     target-dir="com/tencent/trtc/videocall"/>
         <source-file src="src/android/java/com/tencent/trtc/videocall/FloatingView.java"
-                     target-dir="src/com/tencent/trtc/videocall"/>
+                     target-dir="com/tencent/trtc/videocall"/>
         <source-file src="src/android/java/com/tencent/trtc/videocall/VideoCallingActivity.java"
-                     target-dir="src/com/tencent/trtc/videocall"/>
+                     target-dir="com/tencent/trtc/videocall"/>
         <source-file src="src/android/java/com/tencent/trtc/videocall/VideoCallingEnterActivity.java"
-                     target-dir="src/com/tencent/trtc/videocall"/>
+                     target-dir="com/tencent/trtc/videocall"/>
 
         <source-file src="src/android/java/com/tencent/trtc/debug/Constant.java"
-                     target-dir="src/com/tencent/trtc/debug"/>
+                     target-dir="com/tencent/trtc/debug"/>
 
         <resource-file src="src/android/res/drawable/videocall_background.xml"
                        target="res/drawable/videocall_background.xml"/>
@@ -265,17 +338,7 @@
         <resource-file src="src/android/res/mipmap-xxhdpi/view_open.png"
                        target="res/mipmap-xxhdpi/view_open.png"/>
 
-        <resource-file src="src/android/res/values/colors.xml"
-                       target="res/values/colors.xml"/>
-        <resource-file src="src/android/res/values/strings.xml"
-                       target="res/values/strings.xml"/>
-        <resource-file src="src/android/res/values/styles.xml"
-                       target="res/values/styles.xml"/>
 
-        <resource-file src="src/android/res/values-en/strings.xml"
-                       target="res/values-en/strings.xml"/>
-        <resource-file src="src/android/res/values-en/styles.xml"
-                       target="res/values-en/styles.xml"/>
 
         <!-- <lib-file src="src/android/libs/lib.jar" /> -->
 
diff --git a/src/android/res/values-en/strings.xml b/src/android/res/values-en/strings.xml
deleted file mode 100644
index e0f744a..0000000
--- a/src/android/res/values-en/strings.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<resources>
-
-    <string name="app_name">TRTC-API-Example</string>
-    <string name="activity_name">test</string>
-    <string name="launcher_name">testtest</string>
-    <string name="main_trtc_title">TRTC API Example</string>
-
-    <string name="common_please_input_roomid_and_userid">Failed to join call as the user did not grant the required permission.</string>
-
-    <string name="main_trtc_base_funciton">Basic Features</string>
-    <string name="main_item_aduio_call">Audio Call</string>
-    <string name="main_item_aduio_call_desc">One-to-one/Group audio call, which supports muting, hands-free mode, etc.</string>
-    <string name="main_item_video_call">Video Call</string>
-    <string name="main_item_video_call_desc">One-to-one/Group video call, which supports muting, hands-free mode, etc.</string>
-    <string name="main_item_live">Interactive Live Video Streaming</string>
-    <string name="main_item_voice_chat_room">Interactive Live Audio Streaming</string>
-    <string name="main_item_screen_share">Screen Recording Live Streaming</string>
-    <string name="main_item_screen_share_desc">Share the screen during live streaming, designed for online education, game streaming, etc.</string>
-
-    <string name="main_trtc_advanced">Advanced Features</string>
-    <string name="main_item_string_room_id">String-type Room ID</string>
-    <string name="main_rtrc_set_video_quality">Video Quality Setting</string>
-    <string name="main_rtrc_set_audio_quality">Audio Quality Setting</string>
-    <string name="main_rerc_render_params">Render Control</string>
-    <string name="main_item_speed_test">Network Speed Testing</string>
-    <string name="main_item_pushcdn">Publish via CDN</string>
-    <string name="main_trtc_custom_camera">Custom Video Capturing &amp; Rendering</string>
-    <string name="main_rtrc_set_audio_effect">Audio Effect Setting</string>
-    <string name="main_trtc_set_bgm">Background Music Setting</string>
-    <string name="main_trtc_local_video_share">Local Video Sharing</string>
-    <string name="main_item_local_record">Local Recording</string>
-    <string name="main_item_join_multiple_room">Enter Multiple Rooms</string>
-    <string name="main_item_sei_message">Receive/Send SEI Message</string>
-    <string name="main_item_switch_room">Switch Room</string>
-    <string name="main_trtc_connect_other_room_pk">Cross-room Competition</string>
-    <string name="main_item_third_beauty">Third-party Beauty Filter</string>
-
-
-    <string name="videocall_title">Video Call</string>
-    <string name="videocall_room_input_error_tip">Enter a room ID and username</string>
-    <string name="videocall_video_item">Video Settings</string>
-    <string name="videocall_audio_item">Audio Settings</string>
-    <string name="videocall_user_back_camera">Use Rear Camera</string>
-    <string name="videocall_user_front_camera">Use Front Camera</string>
-    <string name="videocall_open_camera">Camera On</string>
-    <string name="videocall_close_camera">Camera Off</string>
-    <string name="videocall_mute_audio">Mic On</string>
-    <string name="videocall_close_mute_audio">Mic Off</string>
-    <string name="videocall_use_speaker">Use Speaker</string>
-    <string name="videocall_use_receiver">Use Receiver</string>
-    <string name="videocall_enter_room">Enter Room</string>
-    <string name="videocall_please_input_userid">User ID (Required)</string>
-    <string name="videocall_please_input_roomid">Room ID (Required)</string>
-    <string name="videocall_roomid">Room ID: </string>
-</resources>
\ No newline at end of file
diff --git a/src/android/res/values-en/styles.xml b/src/android/res/values-en/styles.xml
deleted file mode 100644
index 1195356..0000000
--- a/src/android/res/values-en/styles.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-</resources>
diff --git a/src/android/res/values/colors.xml b/src/android/res/values/colors.xml
deleted file mode 100644
index e4af778..0000000
--- a/src/android/res/values/colors.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="rl_main_bg">#1B1B1B</color>
-    <color name="videocall_green_bg">#00A66B</color>
-    <color name="videocall_title_bg">#B7B7B7</color>
-    <color name="common_green_bg">#34c759</color>
-    <color name="common_edit_solid">#EFEFEF</color>
-    <color name="common_edit_stroke">#FFFFFF</color>
-    <color name="common_radio_select">#34c759</color>
-    <color name="common_raido_select_off">#999999</color>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
-</resources>
diff --git a/src/android/res/values/strings.xml b/src/android/res/values/strings.xml
deleted file mode 100644
index ccad510..0000000
--- a/src/android/res/values/strings.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<resources>
-    <string name="app_name">TRTC-API-Example</string>
-    <string name="activity_name">测试</string>
-    <string name="launcher_name">测试测试</string>
-    <string name="main_trtc_title">腾讯云TRTC API Example</string>
-
-    <string name="common_please_input_roomid_and_userid">用户没有允许需要的权限，加入通话失败</string>
-
-
-    <string name="main_trtc_base_funciton">基础功能</string>
-    <string name="main_item_aduio_call">语音通话</string>
-    <string name="main_item_aduio_call_desc">双人/多人语音通话、包含静音/免提等功能</string>
-    <string name="main_item_video_call">视频通话</string>
-    <string name="main_item_video_call_desc">双人/多人视频通话、包含静音/免提等功能</string>
-    <string name="main_item_live">视频互动直播</string>
-    <string name="main_item_voice_chat_room">语音互动直播</string>
-    <string name="main_item_screen_share">录屏直播</string>
-    <string name="main_item_screen_share_desc">直播过程中分享屏幕，适用于在线教育，游戏直播等场景</string>
-
-    <string name="main_trtc_advanced">进阶功能</string>
-    <string name="main_item_string_room_id">字符串房间号</string>
-    <string name="main_rtrc_set_video_quality">画质设定</string>
-    <string name="main_rtrc_set_audio_quality">音质设定</string>
-    <string name="main_rerc_render_params">渲染控制</string>
-    <string name="main_item_speed_test">网络测速</string>
-    <string name="main_item_pushcdn">CDN发布</string>
-    <string name="main_trtc_custom_camera">自定义视频采集&amp;渲染</string>
-    <string name="main_rtrc_set_audio_effect">设置音效</string>
-    <string name="main_trtc_set_bgm">设置背景音乐</string>
-    <string name="main_trtc_local_video_share">本地视频分享</string>
-    <string name="main_item_local_record">本地媒体录制</string>
-    <string name="main_item_join_multiple_room">加入多个房间</string>
-    <string name="main_item_sei_message">收发SEI消息</string>
-    <string name="main_item_switch_room">快速切换房间</string>
-    <string name="main_trtc_connect_other_room_pk">跨房PK</string>
-    <string name="main_item_third_beauty">第三方美颜</string>
-
-
-    <string name="videocall_title">TRTC 视频通话示例</string>
-    <string name="videocall_room_input_error_tip">"房间号和用户名不能为空"</string>
-    <string name="videocall_video_item">视频选项</string>
-    <string name="videocall_audio_item">音频选项</string>
-    <string name="videocall_user_back_camera">使用后置摄像头</string>
-    <string name="videocall_user_front_camera">使用前置摄像头</string>
-    <string name="videocall_open_camera">打开摄像头</string>
-    <string name="videocall_close_camera">关闭摄像头</string>
-    <string name="videocall_mute_audio">打开麦克风</string>
-    <string name="videocall_close_mute_audio">关闭麦克风</string>
-    <string name="videocall_use_speaker">使用扬声器</string>
-    <string name="videocall_use_receiver">使用听筒</string>
-    <string name="videocall_enter_room">进入房间</string>
-    <string name="videocall_please_input_userid">请输入用户名(必填项)</string>
-    <string name="videocall_please_input_roomid">请输入房间号(必填项)</string>
-    <string name="videocall_roomid">房间号:</string>
-</resources>
\ No newline at end of file
diff --git a/src/android/res/values/styles.xml b/src/android/res/values/styles.xml
deleted file mode 100644
index 1195356..0000000
--- a/src/android/res/values/styles.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
-</resources>