diff --git a/Android/Demo/app/build.gradle b/Android/Demo/app/build.gradle index a8d53b62..cf57569e 100644 --- a/Android/Demo/app/build.gradle +++ b/Android/Demo/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.tencent.liteav.demo" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 13 - versionName "8.3.647" + versionCode 14 + versionName "8.4.664" multiDexEnabled true ndk { @@ -47,7 +47,7 @@ dependencies { compile project(':login') compile project(':liveplayerdemo') compile project(':livepusherdemo') - compile project(':mlvbliveroomdemo') + compile project(':livelinkmicdemoold') compile 'com.android.support:appcompat-v7:25.+' compile 'com.android.support:recyclerview-v7:25.+' diff --git a/Android/Demo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java b/Android/Demo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java index 9218aed4..bcb9b545 100644 --- a/Android/Demo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java +++ b/Android/Demo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java @@ -56,7 +56,7 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); mTvVersion = (TextView) findViewById(R.id.main_tv_version); - mTvVersion.setText("Smart版本 v" + TXLiveBase.getSDKVersionStr()+"(8.3.647)"); + mTvVersion.setText("Smart版本 v" + TXLiveBase.getSDKVersionStr()+"(8.4.664)"); mMainTitle = (TextView) findViewById(R.id.main_title); mMainTitle.setOnLongClickListener(new View.OnLongClickListener() { @@ -201,13 +201,13 @@ private List initGroupData() { // 直播 List pusherChildList = new ArrayList<>(); - pusherChildList.add(new ChildBean("MLVBLiveRoom", R.drawable.room_live, 0, LiveRoomActivity.class)); - pusherChildList.add(new ChildBean("摄像头推流", R.drawable.push, 0, CameraPushEntranceActivity.class)); - pusherChildList.add(new ChildBean("直播播放器", R.drawable.live, 0, LivePlayerEntranceActivity.class)); + pusherChildList.add(new ChildBean("推流演示（摄像头推流）", R.drawable.push, 0, CameraPushEntranceActivity.class)); + pusherChildList.add(new ChildBean("拉流演示", R.drawable.live, 0, LivePlayerEntranceActivity.class)); + pusherChildList.add(new ChildBean("连麦演示", R.drawable.room_live, 0, LiveRoomActivity.class)); if (pusherChildList.size() != 0) { // 这个是网页链接，配合build.sh避免在如ugc_smart版中出现 pusherChildList.add(new ChildBean("小直播", R.drawable.xiaozhibo, 0, null)); - GroupBean pusherGroupBean = new GroupBean("移动直播", R.drawable.room_live, pusherChildList); + GroupBean pusherGroupBean = new GroupBean("移动直播 MLVB", R.drawable.room_live, pusherChildList); groupList.add(pusherGroupBean); } diff --git a/Android/Demo/mlvbliveroomdemo/build.gradle b/Android/Demo/livelinkmicdemoold/build.gradle similarity index 100% rename from Android/Demo/mlvbliveroomdemo/build.gradle rename to Android/Demo/livelinkmicdemoold/build.gradle diff --git a/Android/Demo/mlvbliveroomdemo/consumer-rules.pro b/Android/Demo/livelinkmicdemoold/consumer-rules.pro similarity index 100% rename from Android/Demo/mlvbliveroomdemo/consumer-rules.pro rename to Android/Demo/livelinkmicdemoold/consumer-rules.pro diff --git a/Android/Demo/mlvbliveroomdemo/proguard-rules.pro b/Android/Demo/livelinkmicdemoold/proguard-rules.pro similarity index 100% rename from Android/Demo/mlvbliveroomdemo/proguard-rules.pro rename to Android/Demo/livelinkmicdemoold/proguard-rules.pro diff --git a/Android/Demo/mlvbliveroomdemo/src/main/AndroidManifest.xml b/Android/Demo/livelinkmicdemoold/src/main/AndroidManifest.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/AndroidManifest.xml rename to Android/Demo/livelinkmicdemoold/src/main/AndroidManifest.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/IMLVBLiveRoomListener.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/IMLVBLiveRoomListener.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/IMLVBLiveRoomListener.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/IMLVBLiveRoomListener.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/MLVBLiveRoom.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/MLVBLiveRoom.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/MLVBLiveRoom.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/MLVBLiveRoom.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/MLVBLiveRoomImpl.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/MLVBLiveRoomImpl.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/MLVBLiveRoomImpl.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/MLVBLiveRoomImpl.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/AnchorInfo.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/AnchorInfo.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/AnchorInfo.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/AnchorInfo.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/AudienceInfo.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/AudienceInfo.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/AudienceInfo.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/AudienceInfo.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/LoginInfo.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/LoginInfo.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/LoginInfo.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/LoginInfo.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/MLVBCommonDef.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/MLVBCommonDef.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/MLVBCommonDef.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/MLVBCommonDef.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/RoomInfo.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/RoomInfo.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/RoomInfo.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/commondef/RoomInfo.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/http/HttpRequests.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/http/HttpRequests.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/http/HttpRequests.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/http/HttpRequests.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/http/HttpResponse.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/http/HttpResponse.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/http/HttpResponse.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/http/HttpResponse.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/im/IMMessageMgr.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/im/IMMessageMgr.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/im/IMMessageMgr.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/im/IMMessageMgr.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/im/TXUserInfo.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/im/TXUserInfo.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/im/TXUserInfo.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/im/TXUserInfo.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/AndroidPermissions.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/AndroidPermissions.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/AndroidPermissions.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/AndroidPermissions.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/CommonAppCompatActivity.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/CommonAppCompatActivity.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/CommonAppCompatActivity.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/CommonAppCompatActivity.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/HintDialog.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/HintDialog.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/HintDialog.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/HintDialog.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/NameGenerator.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/NameGenerator.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/NameGenerator.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/misc/NameGenerator.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/widget/RoomListViewAdapter.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/widget/RoomListViewAdapter.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/widget/RoomListViewAdapter.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/widget/RoomListViewAdapter.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/widget/SwipeAnimationController.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/widget/SwipeAnimationController.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/widget/SwipeAnimationController.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/widget/SwipeAnimationController.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/widget/TextMsgInputDialog.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/widget/TextMsgInputDialog.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/widget/TextMsgInputDialog.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/roomutil/widget/TextMsgInputDialog.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/ui/LiveRoomActivity.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/ui/LiveRoomActivity.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/ui/LiveRoomActivity.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/ui/LiveRoomActivity.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/ui/LiveRoomActivityInterface.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/ui/LiveRoomActivityInterface.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/ui/LiveRoomActivityInterface.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/ui/LiveRoomActivityInterface.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/ui/fragment/LiveRoomChatFragment.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/ui/fragment/LiveRoomChatFragment.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/ui/fragment/LiveRoomChatFragment.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/ui/fragment/LiveRoomChatFragment.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/ui/fragment/LiveRoomListFragment.java b/Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/ui/fragment/LiveRoomListFragment.java similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/java/com/tencent/liteav/demo/liveroom/ui/fragment/LiveRoomListFragment.java rename to Android/Demo/livelinkmicdemoold/src/main/java/com/tencent/liteav/demo/liveroom/ui/fragment/LiveRoomListFragment.java diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/anim/mlvb_anim_slice_in_right.xml b/Android/Demo/livelinkmicdemoold/src/main/res/anim/mlvb_anim_slice_in_right.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/anim/mlvb_anim_slice_in_right.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/anim/mlvb_anim_slice_in_right.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/color/mlvb_text_radio_color.xml b/Android/Demo/livelinkmicdemoold/src/main/res/color/mlvb_text_radio_color.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/color/mlvb_text_radio_color.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/color/mlvb_text_radio_color.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_black_bkg.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_black_bkg.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_black_bkg.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_black_bkg.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_btn_kick_out.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_btn_kick_out.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_btn_kick_out.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_btn_kick_out.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_help.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_help.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_help.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_help.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_ic_back.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_ic_back.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_ic_back.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_ic_back.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_icon_message.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_icon_message.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_icon_message.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_icon_message.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_input_box.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_input_box.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_input_box.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_input_box.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_linkmic_start.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_linkmic_start.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_linkmic_start.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_linkmic_start.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_linkmic_stop.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_linkmic_stop.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_linkmic_stop.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_linkmic_stop.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_1.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_1.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_1.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_1.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_10.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_10.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_10.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_10.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_11.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_11.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_11.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_11.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_12.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_12.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_12.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_12.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_13.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_13.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_13.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_13.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_14.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_14.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_14.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_14.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_2.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_2.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_2.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_2.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_3.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_3.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_3.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_3.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_4.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_4.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_4.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_4.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_5.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_5.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_5.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_5.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_6.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_6.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_6.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_6.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_7.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_7.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_7.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_7.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_8.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_8.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_8.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_8.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_9.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_9.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_9.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_9.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image0.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image0.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image0.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image0.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image1.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image1.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image1.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image1.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image2.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image2.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image2.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image2.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image3.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image3.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image3.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image3.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image4.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image4.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image4.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image4.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image5.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image5.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image5.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image5.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image6.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image6.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image6.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image6.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image7.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image7.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_loading_image7.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_loading_image7.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_log.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_log.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_log.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_log.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_log_show.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_log_show.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_log_show.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_log_show.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_lvb_beauty.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_lvb_beauty.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_lvb_beauty.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_lvb_beauty.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_lvb_camera_change.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_lvb_camera_change.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_lvb_camera_change.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_lvb_camera_change.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_mic_disable.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_mic_disable.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_mic_disable.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_mic_disable.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_mic_enable.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_mic_enable.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_mic_enable.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_mic_enable.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_mic_normal.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_mic_normal.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_mic_normal.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_mic_normal.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_new_address.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_new_address.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_new_address.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_new_address.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_pause_publish.jpg b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_pause_publish.jpg similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_pause_publish.jpg rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_pause_publish.jpg diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_pk_start.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_pk_start.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_pk_start.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_pk_start.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_pk_stop.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_pk_stop.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_pk_stop.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_pk_stop.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_qr_code.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_qr_code.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_qr_code.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_qr_code.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_question_link.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_question_link.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_question_link.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_question_link.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_white_bkg.png b/Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_white_bkg.png similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable-xhdpi/mlvb_white_bkg.png rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable-xhdpi/mlvb_white_bkg.png diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/loading_animation.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/loading_animation.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/loading_animation.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/loading_animation.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_gray_thumb.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_gray_thumb.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_gray_thumb.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_gray_thumb.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_green_thumb.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_green_thumb.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_green_thumb.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_green_thumb.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_hint_dialog_normal_bg.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_hint_dialog_normal_bg.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_hint_dialog_normal_bg.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_hint_dialog_normal_bg.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_hint_dialog_pressed_bg.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_hint_dialog_pressed_bg.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_hint_dialog_pressed_bg.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_hint_dialog_pressed_bg.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_hint_dialog_selector_bg.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_hint_dialog_selector_bg.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_hint_dialog_selector_bg.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_hint_dialog_selector_bg.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_linkmic_loading.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_linkmic_loading.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_linkmic_loading.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_linkmic_loading.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_loading_animation.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_loading_animation.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_loading_animation.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_loading_animation.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_resolution_radio.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_resolution_radio.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_resolution_radio.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_resolution_radio.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_round_bg.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_round_bg.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_round_bg.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_round_bg.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_rtmproom_create_room_seletor.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_rtmproom_create_room_seletor.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_rtmproom_create_room_seletor.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_rtmproom_create_room_seletor.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_seekbar_progress_drawable.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_seekbar_progress_drawable.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_seekbar_progress_drawable.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_seekbar_progress_drawable.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_seekbar_style.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_seekbar_style.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_seekbar_style.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_seekbar_style.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_shape_progress_visiblelog.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_shape_progress_visiblelog.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_shape_progress_visiblelog.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_shape_progress_visiblelog.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_shape_progress_visiblelog2.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_shape_progress_visiblelog2.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/mlvb_shape_progress_visiblelog2.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/mlvb_shape_progress_visiblelog2.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/drawable/resolution_radio.xml b/Android/Demo/livelinkmicdemoold/src/main/res/drawable/resolution_radio.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/drawable/resolution_radio.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/drawable/resolution_radio.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_activity_live_room.xml b/Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_activity_live_room.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_activity_live_room.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_activity_live_room.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_dialog_input_text.xml b/Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_dialog_input_text.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_dialog_input_text.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_dialog_input_text.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_fragment_live_room_chat.xml b/Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_fragment_live_room_chat.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_fragment_live_room_chat.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_fragment_live_room_chat.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_fragment_live_room_list.xml b/Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_fragment_live_room_list.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_fragment_live_room_list.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_fragment_live_room_list.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_layout_liveroom_online_pusher.xml b/Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_layout_liveroom_online_pusher.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_layout_liveroom_online_pusher.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_layout_liveroom_online_pusher.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_layout_rtmproom_dialog_create_room.xml b/Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_layout_rtmproom_dialog_create_room.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_layout_rtmproom_dialog_create_room.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_layout_rtmproom_dialog_create_room.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_layout_rtmproom_hint_dialog.xml b/Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_layout_rtmproom_hint_dialog.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_layout_rtmproom_hint_dialog.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_layout_rtmproom_hint_dialog.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_pusher_setting_spinner_text.xml b/Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_pusher_setting_spinner_text.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_pusher_setting_spinner_text.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_pusher_setting_spinner_text.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_rtcroom_chatview_item_left.xml b/Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_rtcroom_chatview_item_left.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_rtcroom_chatview_item_left.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_rtcroom_chatview_item_left.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_rtcroom_chatview_item_right.xml b/Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_rtcroom_chatview_item_right.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_rtcroom_chatview_item_right.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_rtcroom_chatview_item_right.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_rtmproom_roominfo_item.xml b/Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_rtmproom_roominfo_item.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_rtmproom_roominfo_item.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_rtmproom_roominfo_item.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_title_bar_new.xml b/Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_title_bar_new.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/layout/mlvb_title_bar_new.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/layout/mlvb_title_bar_new.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/values/arrays.xml b/Android/Demo/livelinkmicdemoold/src/main/res/values/arrays.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/values/arrays.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/values/arrays.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/values/attrs.xml b/Android/Demo/livelinkmicdemoold/src/main/res/values/attrs.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/values/attrs.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/values/attrs.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/values/colors.xml b/Android/Demo/livelinkmicdemoold/src/main/res/values/colors.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/values/colors.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/values/colors.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/values/dimens.xml b/Android/Demo/livelinkmicdemoold/src/main/res/values/dimens.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/values/dimens.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/values/dimens.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/values/strings.xml b/Android/Demo/livelinkmicdemoold/src/main/res/values/strings.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/values/strings.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/values/strings.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/values/styles.xml b/Android/Demo/livelinkmicdemoold/src/main/res/values/styles.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/values/styles.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/values/styles.xml diff --git a/Android/Demo/mlvbliveroomdemo/src/main/res/xml/file_paths.xml b/Android/Demo/livelinkmicdemoold/src/main/res/xml/file_paths.xml similarity index 100% rename from Android/Demo/mlvbliveroomdemo/src/main/res/xml/file_paths.xml rename to Android/Demo/livelinkmicdemoold/src/main/res/xml/file_paths.xml diff --git a/Android/Demo/settings.gradle b/Android/Demo/settings.gradle index 3a0aad19..fd193879 100644 --- a/Android/Demo/settings.gradle +++ b/Android/Demo/settings.gradle @@ -9,4 +9,4 @@ include ':audioeffectsettingkit' include ':liveplayerdemo' include ':livepusherdemo' -include ':mlvbliveroomdemo' +include ':livelinkmicdemoold' diff --git a/Android/SimpleDemo/app/.gitignore b/Android/SimpleDemo/app/.gitignore new file mode 100644 index 00000000..796b96d1 --- /dev/null +++ b/Android/SimpleDemo/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/Android/SimpleDemo/app/build.gradle b/Android/SimpleDemo/app/build.gradle new file mode 100644 index 00000000..dbf9e536 --- /dev/null +++ b/Android/SimpleDemo/app/build.gradle @@ -0,0 +1,31 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion + + defaultConfig { + applicationId "com.tencent.liteav.demo" + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + versionCode 1 + versionName "1.0" + ndk { + abiFilters "armeabi", "armeabi-v7a", "arm64-v8a" + } + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation "$rootProject.ext.liteavSdk" + implementation project(':v2') +} diff --git a/Android/SimpleDemo/app/proguard-rules.pro b/Android/SimpleDemo/app/proguard-rules.pro new file mode 100644 index 00000000..f1b42451 --- /dev/null +++ b/Android/SimpleDemo/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/Android/SimpleDemo/app/src/main/AndroidManifest.xml b/Android/SimpleDemo/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..65309842 --- /dev/null +++ b/Android/SimpleDemo/app/src/main/AndroidManifest.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Android/SimpleDemo/app/src/main/java/com/tencent/mlvbsimpledemo/DemoApplication.java b/Android/SimpleDemo/app/src/main/java/com/tencent/mlvbsimpledemo/DemoApplication.java new file mode 100644 index 00000000..ef325cd8 --- /dev/null +++ b/Android/SimpleDemo/app/src/main/java/com/tencent/mlvbsimpledemo/DemoApplication.java @@ -0,0 +1,22 @@ +package com.tencent.mlvbsimpledemo; + +import android.app.Application; +import com.tencent.rtmp.TXLiveBase; + +public class DemoApplication extends Application { + + private static DemoApplication instance; + + // 如何获取License? 请参考官网指引 https://cloud.tencent.com/document/product/454/34750 + String licenceUrl = "http://download-1252463788.cossh.myqcloud.com/xiaoshipin/licence_android/RDM_Enterprise.license"; + String licenseKey = "9bc74ac7bfd07ea392e8fdff2ba5678a"; + + @Override + public void onCreate() { + super.onCreate(); + instance = this; + TXLiveBase.setConsoleEnabled(true); + TXLiveBase.getInstance().setLicence(instance, licenceUrl, licenseKey); + } + +} diff --git a/Android/SimpleDemo/app/src/main/java/com/tencent/mlvbsimpledemo/MainActivity.java b/Android/SimpleDemo/app/src/main/java/com/tencent/mlvbsimpledemo/MainActivity.java new file mode 100644 index 00000000..dbdfba44 --- /dev/null +++ b/Android/SimpleDemo/app/src/main/java/com/tencent/mlvbsimpledemo/MainActivity.java @@ -0,0 +1,35 @@ +package com.tencent.mlvbsimpledemo; + +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; +import android.view.View; + +import androidx.appcompat.app.AppCompatActivity; + +import com.example.v2.V2MainActivity; +import com.tencent.liteav.demo.R; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + getSupportActionBar().hide(); + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + findViewById(R.id.launch_view).setVisibility(View.GONE); + } + }, 1000); + findViewById(R.id.bt_v2).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(MainActivity.this, V2MainActivity.class); + startActivity(intent); + } + }); + } + +} diff --git a/Android/SimpleDemo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/Android/SimpleDemo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000..1f6bb290 --- /dev/null +++ b/Android/SimpleDemo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/Android/SimpleDemo/app/src/main/res/drawable/button_bg.xml b/Android/SimpleDemo/app/src/main/res/drawable/button_bg.xml new file mode 100644 index 00000000..3d2353fa --- /dev/null +++ b/Android/SimpleDemo/app/src/main/res/drawable/button_bg.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/Android/SimpleDemo/app/src/main/res/drawable/ic_launcher_background.xml b/Android/SimpleDemo/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..0d025f9b --- /dev/null +++ b/Android/SimpleDemo/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Android/SimpleDemo/app/src/main/res/layout/activity_main.xml b/Android/SimpleDemo/app/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..5ed26dd2 --- /dev/null +++ b/Android/SimpleDemo/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + +