Skip to content

android / dayu

Go to a project
Commit 3730bc0c by mReturn
Options

横屏直播2.6.1

parent 995f3e2c
Inline Side-by-side
Showing with 32 additions and 29 deletions
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)
/** /**
......
build.gradle
...@@ -5,8 +5,8 @@ buildscript { ...@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3" ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 17 ext.min_sdk_version = 17
ext.target_sdk_version = 26 ext.target_sdk_version = 26
ext.version_code = 260 ext.version_code = 261
ext.verson_name = "2.6.0" ext.verson_name = "2.6.1"
ext.gradle_version = '3.1.4' ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false ext.isReleaseMinify = false
ext.isDebugMinify = false ext.isDebugMinify = false
......
liveModule/build.gradle
...@@ -35,8 +35,8 @@ dependencies { ...@@ -35,8 +35,8 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs/upload') implementation fileTree(include: ['*.jar'], dir: 'libs/upload')
implementation "com.android.support:appcompat-v7:27.1.1" implementation "com.android.support:appcompat-v7:27.1.1"
implementation 'com.android.support:recyclerview-v7:27.1.1' implementation 'com.android.support:recyclerview-v7:27.1.1'
// api 'com.tencent.liteav:LiteAVSDK_Professional:latest.release' api 'com.tencent.liteav:LiteAVSDK_Professional:latest.release'
api 'com.tencent.liteavsdk:LiteAVSDK_Smart:latest.release' // api 'com.tencent.liteavsdk:LiteAVSDK_Smart:latest.release'
// MLVB 需要依赖 okhttp 拦截器 // MLVB 需要依赖 okhttp 拦截器
implementation 'com.squareup.okhttp3:logging-interceptor:3.8.1' implementation 'com.squareup.okhttp3:logging-interceptor:3.8.1'
// MLVB 需要使用 gson 进行 json 解析 // MLVB 需要使用 gson 进行 json 解析
......
liveModule/src/main/java/com/dayu/livemodule/LiveUtils.java
package com.dayu.livemodule; package com.dayu.livemodule;
import android.content.Context; import android.content.Context;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import com.dayu.livemodule.roomutil.commondef.AnchorInfo; import com.dayu.livemodule.roomutil.commondef.AnchorInfo;
...@@ -46,8 +47,10 @@ public class LiveUtils { ...@@ -46,8 +47,10 @@ public class LiveUtils {
//初始化用户 //初始化用户
public static void initUser(int uid,String username, String avatarUrl) { public static void initUser(int uid,String username, String avatarUrl) {
final TCUserMgr tcLoginMgr = TCUserMgr.getInstance(); final TCUserMgr tcLoginMgr = TCUserMgr.getInstance();
String brand = Build.BRAND+"_"+Build.MODEL+"_"+Build.VERSION.RELEASE;
tcLoginMgr.setNickName(username,null); tcLoginMgr.setNickName(username,null);
tcLoginMgr.setAvatar(avatarUrl,null); tcLoginMgr.setAvatar(avatarUrl,null);
// tcLoginMgr.login(uid+"_"+brand, "", new TCHTTPMgr.Callback() {
tcLoginMgr.login(uid+"", "", new TCHTTPMgr.Callback() { tcLoginMgr.login(uid+"", "", new TCHTTPMgr.Callback() {
@Override @Override
public void onSuccess(JSONObject data) { public void onSuccess(JSONObject data) {
......
liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/audience/TCAudienceActivity.java
...@@ -452,7 +452,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene ...@@ -452,7 +452,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
showNoticeToast("等待主播接受......"); showNoticeToast("等待主播接受......");
mLiveRoom.muteAllRemoteAudio(true); mLiveRoom.muteAllRemoteAudio(false);
mLiveRoom.requestJoinAnchor("", new IMLVBLiveRoomListener.RequestJoinAnchorCallback() { mLiveRoom.requestJoinAnchor("", new IMLVBLiveRoomListener.RequestJoinAnchorCallback() {
@Override @Override
public void onAccept() { public void onAccept() {
......
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