Skip to content

android / dayu

Go to a project
Commit b6a1ddec by mReturn
Options

横屏直播

parent 69d53b70
Expand all
Inline Side-by-side
Showing with 146 additions and 267 deletions
.idea/gradle.xml
...@@ -11,8 +11,10 @@ ...@@ -11,8 +11,10 @@
<option value="$PROJECT_DIR$/IDCardLib" /> <option value="$PROJECT_DIR$/IDCardLib" />
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/baseSDK" /> <option value="$PROJECT_DIR$/baseSDK" />
<option value="$PROJECT_DIR$/beauty" />
<option value="$PROJECT_DIR$/camera" /> <option value="$PROJECT_DIR$/camera" />
<option value="$PROJECT_DIR$/learnCenter" /> <option value="$PROJECT_DIR$/learnCenter" />
<option value="$PROJECT_DIR$/liveModule" />
<option value="$PROJECT_DIR$/locationComponent" /> <option value="$PROJECT_DIR$/locationComponent" />
<option value="$PROJECT_DIR$/managercenter" /> <option value="$PROJECT_DIR$/managercenter" />
<option value="$PROJECT_DIR$/messageCenter" /> <option value="$PROJECT_DIR$/messageCenter" />
......
.idea/modules.xml
...@@ -5,9 +5,11 @@ ...@@ -5,9 +5,11 @@
<module fileurl="file://$PROJECT_DIR$/IDCardLib/IDCardLib.iml" filepath="$PROJECT_DIR$/IDCardLib/IDCardLib.iml" /> <module fileurl="file://$PROJECT_DIR$/IDCardLib/IDCardLib.iml" filepath="$PROJECT_DIR$/IDCardLib/IDCardLib.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/baseSDK/baseSDK.iml" filepath="$PROJECT_DIR$/baseSDK/baseSDK.iml" /> <module fileurl="file://$PROJECT_DIR$/baseSDK/baseSDK.iml" filepath="$PROJECT_DIR$/baseSDK/baseSDK.iml" />
<module fileurl="file://$PROJECT_DIR$/beauty/beauty.iml" filepath="$PROJECT_DIR$/beauty/beauty.iml" />
<module fileurl="file://$PROJECT_DIR$/camera/camera.iml" filepath="$PROJECT_DIR$/camera/camera.iml" /> <module fileurl="file://$PROJECT_DIR$/camera/camera.iml" filepath="$PROJECT_DIR$/camera/camera.iml" />
<module fileurl="file://$PROJECT_DIR$/dayu-saas-android.iml" filepath="$PROJECT_DIR$/dayu-saas-android.iml" /> <module fileurl="file://$PROJECT_DIR$/dayu-saas-android.iml" filepath="$PROJECT_DIR$/dayu-saas-android.iml" />
<module fileurl="file://$PROJECT_DIR$/learnCenter/learnCenter.iml" filepath="$PROJECT_DIR$/learnCenter/learnCenter.iml" /> <module fileurl="file://$PROJECT_DIR$/learnCenter/learnCenter.iml" filepath="$PROJECT_DIR$/learnCenter/learnCenter.iml" />
<module fileurl="file://$PROJECT_DIR$/liveModule/liveModule.iml" filepath="$PROJECT_DIR$/liveModule/liveModule.iml" />
<module fileurl="file://$PROJECT_DIR$/locationComponent/locationComponent.iml" filepath="$PROJECT_DIR$/locationComponent/locationComponent.iml" /> <module fileurl="file://$PROJECT_DIR$/locationComponent/locationComponent.iml" filepath="$PROJECT_DIR$/locationComponent/locationComponent.iml" />
<module fileurl="file://$PROJECT_DIR$/managercenter/managercenter.iml" filepath="$PROJECT_DIR$/managercenter/managercenter.iml" /> <module fileurl="file://$PROJECT_DIR$/managercenter/managercenter.iml" filepath="$PROJECT_DIR$/managercenter/managercenter.iml" />
<module fileurl="file://$PROJECT_DIR$/messageCenter/messageCenter.iml" filepath="$PROJECT_DIR$/messageCenter/messageCenter.iml" /> <module fileurl="file://$PROJECT_DIR$/messageCenter/messageCenter.iml" filepath="$PROJECT_DIR$/messageCenter/messageCenter.iml" />
......
baseSDK/src/main/java/com/dayu/common/Constants.java
...@@ -42,18 +42,18 @@ public class Constants { ...@@ -42,18 +42,18 @@ public class Constants {
/** /**
* dev环境配置. * dev环境配置.
*/ */
// public static String ENVIROMENT = "debug"; public static String ENVIROMENT = "debug";
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL; public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static String BASE_URL = "http://47.94.101.239:3112"; public static String BASE_URL = "http://47.94.101.239:3112";
// public static String WEB_SOP = "http://47.94.101.239:9004/#/sop"; public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
// public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult"; public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop"; public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
// public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail"; public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
// public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"; public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video"; public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
// public static final boolean IS_DEBUG = true; public static final boolean IS_DEBUG = true;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live) public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
/** /**
...@@ -77,18 +77,18 @@ public class Constants { ...@@ -77,18 +77,18 @@ public class Constants {
/** /**
* 正式环境. * 正式环境.
*/ */
public static String ENVIROMENT = "release"; // public static String ENVIROMENT = "release";
public static int LOG_LEVEL = LogUtils.LEVEL_OFF; // public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
public static String BASE_URL = "https://mobile.kf.ai"; // public static String BASE_URL = "https://mobile.kf.ai";
public static String WEB_SOP = "https://sop.kf.ai/#/sop"; // public static String WEB_SOP = "https://sop.kf.ai/#/sop";
public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail"; // public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail"; // public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult"; // public static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop"; // public static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"; // public static final String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video"; // public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
public static final boolean IS_DEBUG = false; // public static final boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live) // public static String VIDEO_SHARE_URL = "http://app.dl.kf.ai/ext/#/shareVideo?type=_type&id="; //学习视频分享链接 type(课程: course 直播: live)
/** /**
......
learnCenter/src/main/release/AndroidManifest.xml
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
/> />
<activity android:name=".ui.activity.VideoPlayActivity" <activity android:name=".ui.activity.VideoPlayActivity"
android:screenOrientation="portrait" android:screenOrientation="landscape"
/> />
</application> </application>
......
liveModule/src/main/AndroidManifest.xml
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".xiaozhibo.audience.TCAudienceActivity" android:name=".xiaozhibo.audience.TCAudienceActivity"
android:screenOrientation="portrait" android:screenOrientation="landscape"
android:theme="@style/PlayerTheme" android:theme="@style/PlayerTheme"
android:windowSoftInputMode="adjustNothing" /> android:windowSoftInputMode="adjustNothing" />
<activity <activity
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
android:windowSoftInputMode="adjustNothing" /> android:windowSoftInputMode="adjustNothing" />
<activity <activity
android:name=".xiaozhibo.anchor.TCCameraAnchorActivity" android:name=".xiaozhibo.anchor.TCCameraAnchorActivity"
android:screenOrientation="portrait" android:screenOrientation="landscape"
android:theme="@style/PlayerTheme"
android:windowSoftInputMode="adjustNothing" /> android:windowSoftInputMode="adjustNothing" />
<activity <activity
android:name=".xiaozhibo.anchor.screen.TCScreenAnchorActivity" android:name=".xiaozhibo.anchor.screen.TCScreenAnchorActivity"
......
liveModule/src/main/AndroidManifest2.xml deleted 100644 → 0
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dayu.livemodule" >
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<!-- IMSDK 权限 -->
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<!--<uses-permission android:name="android.permission.SET_DEBUG_APP" />-->
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<application
android:usesCleartextTraffic="true"
android:largeHeap="true"
>
<activity
android:name=".xiaozhibo.login.TCLoginActivity"
android:screenOrientation="portrait"
android:theme="@style/LoginTheme" />
<activity
android:name=".xiaozhibo.login.TCRegisterActivity"
android:screenOrientation="portrait"
android:theme="@style/RegisterTheme" />
<activity
android:name=".xiaozhibo.main.TCMainActivity"
android:screenOrientation="portrait"
android:launchMode="singleTask"/>
<activity
android:name=".xiaozhibo.anchor.prepare.TCAnchorPrepareActivity"
android:screenOrientation="portrait" />
<activity
android:name=".xiaozhibo.audience.TCAudienceActivity"
android:screenOrientation="landscape"
android:theme="@style/PlayerTheme"
android:windowSoftInputMode="adjustNothing" />
<activity
android:name=".xiaozhibo.playback.TCPlaybackActivity"
android:screenOrientation="portrait"
android:theme="@style/PlayerTheme"
android:windowSoftInputMode="adjustNothing" />
<activity
android:name=".xiaozhibo.anchor.TCCameraAnchorActivity"
android:screenOrientation="landscape"
android:theme="@style/PlayerTheme"
android:windowSoftInputMode="adjustNothing" />
<activity
android:name=".xiaozhibo.anchor.screen.TCScreenAnchorActivity"
android:theme="@style/RecordActivityTheme"
android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustNothing"
android:launchMode="singleTask">
<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<service
android:name=".xiaozhibo.anchor.screen.TCScreenRecordService"
android:enabled="true"
android:exported="false">
</service>
<activity android:name="com.tencent.rtmp.video.TXScreenCapture$TXScreenCaptureAssistantActivity" android:theme="@android:style/Theme.Translucent" />
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.dayu.bigfish.fileProvider"
android:grantUriPermissions="true"
android:exported="false">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/filepaths" />
</provider>
<uses-library
android:name="com.google.android.maps"
android:required="false" />
<uses-library android:name="android.test.runner" />
<service
android:name="com.tencent.imsdk.session.remote.SessionService"
android:process=":network" />
<service
android:name="com.tencent.imsdk.session.remote.AssistService"
android:process=":network" />
<service
android:name="com.tencent.imsdk.session.remote.KeepAliveJobService"
android:permission="android.permission.BIND_JOB_SERVICE"
android:process=":network" />
<receiver android:name="com.tencent.imsdk.session.SessionBroadcastReceiver" >
<intent-filter>
<action android:name="com.tencent.imsdk.session.boot" />
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
<action android:name="com.tencent.qcloud.qal.TASK_REMOVED" />
</intent-filter>
</receiver>
</application>
</manifest>
liveModule/src/main/java/com/dayu/livemodule/MLVBLiveRoomImpl2.java deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/TCCameraAnchorActivity.java
...@@ -13,13 +13,13 @@ import android.support.v7.widget.RecyclerView; ...@@ -13,13 +13,13 @@ import android.support.v7.widget.RecyclerView;
import android.util.Log; import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.WindowManager;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.dayu.livemodule.IMLVBLiveRoomListener;
import com.dayu.livemodule.R; import com.dayu.livemodule.R;
import com.dayu.livemodule.roomutil.commondef.AnchorInfo; import com.dayu.livemodule.roomutil.commondef.AnchorInfo;
import com.dayu.livemodule.xiaozhibo.anchor.music.TCAudioControl; import com.dayu.livemodule.xiaozhibo.anchor.music.TCAudioControl;
...@@ -47,9 +47,9 @@ import java.util.Locale; ...@@ -47,9 +47,9 @@ import java.util.Locale;
* Function: 主播推流的页面 * Function: 主播推流的页面
* <p> * <p>
* <p> * <p>
* 1. MLVB 其他观众发起连麦请求处理：{@link TCCameraAnchorActivity#onRequestJoinAnchor(AnchorInfo, String)} * 1. MLVB 其他观众发起连麦请求处理：{@link TCCameraAnchorActivity2#onRequestJoinAnchor(AnchorInfo, String)}
* <p> * <p>
* 2. MLVB 其他主播连麦，结束连麦处理：{@link TCCameraAnchorActivity#onAnchorEnter(AnchorInfo)} {@link TCCameraAnchorActivity#onAnchorExit(AnchorInfo)} * 2. MLVB 其他主播连麦，结束连麦处理：{@link TCCameraAnchorActivity2#onAnchorEnter(AnchorInfo)} {@link TCCameraAnchorActivity2#onAnchorExit(AnchorInfo)}
* <p> * <p>
* 3. 音效控制面板类 {@link TCAudioControl} * 3. 音效控制面板类 {@link TCAudioControl}
* <p> * <p>
...@@ -71,6 +71,8 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity { ...@@ -71,6 +71,8 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity {
private TextView mBroadcastTime; // 已经开播的时间 private TextView mBroadcastTime; // 已经开播的时间
private TextView mMemberCount; // 观众数量 private TextView mMemberCount; // 观众数量
View halfView;
private TCAudioControl mAudioCtrl; // 音效控制面板 private TCAudioControl mAudioCtrl; // 音效控制面板
private LinearLayout mAudioPluginLayout; private LinearLayout mAudioPluginLayout;
...@@ -103,7 +105,9 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity { ...@@ -103,7 +105,9 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity {
@Override @Override
protected void initView() { protected void initView() {
setContentView(R.layout.activity_camera_anchor); setContentView(R.layout.activity_camera_anchor);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
super.initView(); super.initView();
halfView = findViewById(R.id.half_view);
mTXCloudVideoView = (TXCloudVideoView) findViewById(R.id.anchor_video_view); mTXCloudVideoView = (TXCloudVideoView) findViewById(R.id.anchor_video_view);
mTXCloudVideoView.setLogMargin(10, 10, 45, 55); mTXCloudVideoView.setLogMargin(10, 10, 45, 55);
...@@ -156,7 +160,7 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity { ...@@ -156,7 +160,7 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity {
} }
mLiveRoom.startLocalPreview(true, videoView.videoView); mLiveRoom.startLocalPreview(true, videoView.videoView);
mLiveRoom.startRemoteView(item, mTXCloudVideoView, new IMLVBLiveRoomListener.PlayCallback() { mLiveRoom.startRemoteView(item, mTXCloudVideoView, new PlayCallback() {
@Override @Override
public void onBegin() { public void onBegin() {
} }
...@@ -321,7 +325,7 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity { ...@@ -321,7 +325,7 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity {
} }
videoView.startLoading(); videoView.startLoading();
mLiveRoom.startRemoteView(pusherInfo, videoView.videoView, new IMLVBLiveRoomListener.PlayCallback() { mLiveRoom.startRemoteView(pusherInfo, videoView.videoView, new PlayCallback() {
@Override @Override
public void onBegin() { public void onBegin() {
videoView.stopLoading(true); //推流成功，stopLoading 大主播显示出踢人的button videoView.stopLoading(true); //推流成功，stopLoading 大主播显示出踢人的button
...@@ -496,6 +500,15 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity { ...@@ -496,6 +500,15 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity {
*/ */
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (null != mAudioCtrl && mAudioCtrl.getVisibility() == View.VISIBLE) {
mAudioCtrl.setVisibility( View.GONE);
return;
}
if (mBeautyControl.isShown() || mBeautyControl.getVisibility() == View.VISIBLE) {
mBeautyControl.setVisibility( View.GONE);
return;
}
int i = v.getId(); int i = v.getId();
if (i == R.id.switch_cam) { if (i == R.id.switch_cam) {
if (mLiveRoom != null) { if (mLiveRoom != null) {
......
liveModule/src/main/res/layout/activity_audience.xml
...@@ -5,6 +5,13 @@ ...@@ -5,6 +5,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:ignore="contentDescription"> tools:ignore="contentDescription">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
>
</LinearLayout>
<com.tencent.rtmp.ui.TXCloudVideoView <com.tencent.rtmp.ui.TXCloudVideoView
android:id="@+id/anchor_video_view" android:id="@+id/anchor_video_view"
...@@ -20,33 +27,33 @@ ...@@ -20,33 +27,33 @@
<!--连麦：播放小窗口定义 开始--> <!--连麦：播放小窗口定义 开始-->
<ScrollView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentBottom="true" android:orientation="horizontal"
android:layout_marginBottom="56dp" >
android:layout_alignParentRight="true"> <View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"/>
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content"> android:layout_weight="1"
android:layout_height="match_parent">
<!--连麦：第一个播放小窗口--> <!--连麦：第一个播放小窗口-->
<FrameLayout <FrameLayout
android:id="@+id/frameLayout1" android:id="@+id/frameLayout1"
android:layout_width="180dp" android:layout_width="match_parent"
android:layout_height="270dp" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginRight="8dp"
> >
<com.tencent.rtmp.ui.TXCloudVideoView <com.tencent.rtmp.ui.TXCloudVideoView
android:id="@+id/video_player1" android:id="@+id/video_player1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone"></com.tencent.rtmp.ui.TXCloudVideoView> android:visibility="gone"/>
<FrameLayout <FrameLayout
android:id="@+id/loading_background1" android:id="@+id/loading_background1"
...@@ -69,14 +76,28 @@ ...@@ -69,14 +76,28 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout>
</LinearLayout>
<ScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="56dp"
android:layout_alignParentRight="true">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<!--连麦：第二个播放小窗口--> <!--连麦：第二个播放小窗口-->
<FrameLayout <FrameLayout
android:id="@+id/frameLayout2" android:id="@+id/frameLayout2"
android:layout_width="180dp" android:layout_width="180dp"
android:layout_height="270dp" android:layout_height="270dp"
android:layout_above="@+id/frameLayout1" >
android:layout_alignRight="@+id/frameLayout1"> <!--android:layout_above="@+id/frameLayout1"-->
<!--android:layout_alignRight="@+id/frameLayout1"-->
<com.tencent.rtmp.ui.TXCloudVideoView <com.tencent.rtmp.ui.TXCloudVideoView
android:id="@+id/video_player2" android:id="@+id/video_player2"
...@@ -378,7 +399,7 @@ ...@@ -378,7 +399,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="15dp" android:layout_marginRight="125dp"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<com.dayu.livemodule.xiaozhibo.common.widget.like.TCHeartLayout <com.dayu.livemodule.xiaozhibo.common.widget.like.TCHeartLayout
......
liveModule/src/main/res/layout/activity_camera_anchor.xml
...@@ -3,6 +3,18 @@ ...@@ -3,6 +3,18 @@
android:id="@+id/rl_root" android:id="@+id/rl_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:visibility="gone"
>
<View
android:id="@+id/half_view"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"/>
</LinearLayout>
<com.tencent.rtmp.ui.TXCloudVideoView <com.tencent.rtmp.ui.TXCloudVideoView
android:id="@+id/anchor_video_view" android:id="@+id/anchor_video_view"
...@@ -13,32 +25,33 @@ ...@@ -13,32 +25,33 @@
<!--连麦：播放小窗口定义 开始--> <!--连麦：播放小窗口定义 开始-->
<ScrollView <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:orientation="horizontal"
android:layout_alignParentBottom="true"
android:layout_marginBottom="56dp"
> >
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1"/>
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content"> android:layout_weight="1"
android:background="#00000000"
android:layout_height="match_parent">
<!--连麦：第一个播放小窗口--> <!--连麦：第一个播放小窗口-->
<FrameLayout <FrameLayout
android:id="@+id/frameLayout1" android:id="@+id/frameLayout1"
android:layout_width="180dp" android:layout_width="match_parent"
android:layout_height="270dp" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="8dp"
> >
<com.tencent.rtmp.ui.TXCloudVideoView <com.tencent.rtmp.ui.TXCloudVideoView
android:id="@+id/video_player1" android:id="@+id/video_player1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone"></com.tencent.rtmp.ui.TXCloudVideoView> android:visibility="gone"/>
<FrameLayout <FrameLayout
android:id="@+id/loading_background1" android:id="@+id/loading_background1"
...@@ -69,13 +82,29 @@ ...@@ -69,13 +82,29 @@
android:onClick="onClick" android:onClick="onClick"
android:visibility="invisible" /> android:visibility="invisible" />
</RelativeLayout>
</LinearLayout>
<ScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="56dp"
>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<!--连麦：第二个播放小窗口--> <!--连麦：第二个播放小窗口-->
<FrameLayout <FrameLayout
android:id="@+id/frameLayout2" android:id="@+id/frameLayout2"
android:layout_width="180dp" android:layout_width="180dp"
android:layout_height="270dp" android:layout_height="270dp"
android:layout_above="@+id/frameLayout1" >
android:layout_alignRight="@+id/frameLayout1"> <!--android:layout_above="@+id/frameLayout1"-->
<!--android:layout_alignRight="@+id/frameLayout1"-->
<com.tencent.rtmp.ui.TXCloudVideoView <com.tencent.rtmp.ui.TXCloudVideoView
android:id="@+id/video_player2" android:id="@+id/video_player2"
...@@ -155,6 +184,7 @@ ...@@ -155,6 +184,7 @@
android:onClick="onClick" android:onClick="onClick"
android:visibility="invisible" /> android:visibility="invisible" />
</RelativeLayout> </RelativeLayout>
</ScrollView> </ScrollView>
<!--连麦：播放小窗口定义 结束--> <!--连麦：播放小窗口定义 结束-->
...@@ -299,16 +329,23 @@ ...@@ -299,16 +329,23 @@
android:stackFromBottom="true" android:stackFromBottom="true"
android:transcriptMode="normal" /> android:transcriptMode="normal" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
android:layout_marginBottom="60dp"
android:background="#00000000"
>
<com.dayu.livemodule.xiaozhibo.anchor.music.TCAudioControl <com.dayu.livemodule.xiaozhibo.anchor.music.TCAudioControl
android:id="@+id/anchor_audio_control" android:id="@+id/anchor_audio_control"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:background="#ffffff"
android:clickable="true" android:clickable="true"
android:orientation="vertical" android:orientation="vertical"
android:padding="0dp" android:padding="0dp"
android:visibility="gone" /> android:visibility="gone" />
</ScrollView>
<com.tencent.liteav.demo.beauty.BeautyPanel <com.tencent.liteav.demo.beauty.BeautyPanel
android:id="@+id/beauty_panel" android:id="@+id/beauty_panel"
...@@ -391,6 +428,7 @@ ...@@ -391,6 +428,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<com.dayu.livemodule.xiaozhibo.common.widget.like.TCHeartLayout <com.dayu.livemodule.xiaozhibo.common.widget.like.TCHeartLayout
......
liveModule/src/main/res/layout/audio_ctrl.xml
...@@ -515,6 +515,7 @@ ...@@ -515,6 +515,7 @@
android:background="@color/colorGray7"/> android:background="@color/colorGray7"/>
<TextView <TextView
android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:text="音效调节" android:text="音效调节"
......
liveModule/src/main/res/layout/dialog_input_text.xml
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
android:layout_weight="4" android:layout_weight="4"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeActionId="@+id/login" android:imeActionId="@+id/login"
android:imeOptions="actionUnspecified" android:imeOptions="flagNoExtractUi"
android:inputType="text" android:inputType="text"
android:maxLength="32" android:maxLength="32"
android:textColor="@color/black" android:textColor="@color/black"
......
liveModule/src/main/res/layout/dialog_input_text2.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rl_outside_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/rl_inputdlg_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_input_dialog_background"
android:orientation="horizontal"
android:layout_alignParentBottom="true">
<LinearLayout
android:id="@+id/barrage_area"
android:orientation="horizontal"
android:layout_weight="0.3"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<Button
android:id="@+id/barrage_btn"
android:layout_width="40dp"
android:layout_marginLeft="10dp"
android:layout_height="25dp"
android:layout_marginRight="10dp"
android:background="@drawable/barrage_slider_off" />
</LinearLayout>
<View android:layout_width="0.5dp"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_marginLeft="6dp"
android:layout_marginStart="6dp"
android:background="@color/colorTransparentBlack"/>
<EditText
android:id="@+id/et_input_message"
android:hint="@string/dialog_input_text_hint"
android:layout_width="match_parent"
android:layout_weight="4"
android:layout_height="wrap_content"
android:imeActionId="@+id/login"
android:imeOptions="flagNoExtractUi"
android:inputType="text"
android:maxLength="32"
android:textColor="@color/black"
android:maxLines="1"
android:singleLine="true" />
<View android:layout_width="0.5dp"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_marginLeft="6dp"
android:layout_marginStart="6dp"
android:background="@color/colorTransparentBlack"/>
<LinearLayout
android:id="@+id/confirm_area"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_height="wrap_content">
<Button
android:id="@+id/confrim_btn"
android:layout_width="50dp"
android:layout_height="30dp"
android:background="@drawable/btn_send_message"
android:gravity="center"
android:textColor="@color/colorAccent"
android:text="@string/send" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment