Skip to content

android / dayu

Go to a project
Commit 995f3e2c by mReturn
Options

横屏直播优化

parent b6a1ddec
Inline Side-by-side
Showing with 120 additions and 87 deletions
app/src/main/java/com/dayu/bigfish/InitializeActivity.java
......@@ -60,6 +60,7 @@ public class InitializeActivity extends DataBindingActivity<ActivityInitializeMa
SPUtils.put("env","");
}
initVersion();
MobclickAgent.openActivityDurationTrack(false);
mActivity = this;
String[] mPerArr = new String[]{Manifest.permission.READ_PHONE_STATE, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.WRITE_EXTERNAL_STORAGE
......@@ -82,6 +83,16 @@ public class InitializeActivity extends DataBindingActivity<ActivityInitializeMa
initVp();
}
private void initVersion() {
String versionCode = AppUtils.getPackageNum();
if (Constants.ENVIROMENT.equals("debug")) {
versionCode = (String.format(getString(com.dayu.usercenter.R.string.enviroment_debug), versionCode));
} else if (Constants.ENVIROMENT.equals("uat")) {
versionCode = (String.format(getString(com.dayu.usercenter.R.string.enviroment_uat), versionCode));
}
mBind.tvVersion.setText(versionCode);
}
private void initVp() {
}
......
app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
......@@ -42,7 +42,11 @@ public class LocationService extends Service {
public void onCreate() {
super.onCreate();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
try {
startForeground(1,new Notification());
} catch (Exception e) {
e.printStackTrace();
}
}
mHandler = new Handler() {
@Override
......
app/src/main/res/layout/activity_initialize_main.xml
......@@ -3,11 +3,10 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<RelativeLayout
android:visibility="gone"
android:id="@+id/rl_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffffff">
android:background="@color/transparent">
<android.support.v4.view.ViewPager
android:id="@+id/vp_initial"
......@@ -15,35 +14,8 @@
android:layout_height="match_parent"
android:visibility="gone"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.4"
>
<ImageView
android:id="@+id/iv_logo"
android:layout_width="140dp"
android:layout_height="140dp"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:src="@drawable/icon_app_logo"
android:visibility="visible" />
</RelativeLayout>
<View
android:layout_width="1dp"
android:layout_height="0dp"
android:layout_weight="0.6"
/>
</LinearLayout>
<ImageView
android:visibility="gone"
android:id="@+id/start_pager_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -51,15 +23,14 @@
android:scaleType="fitStart"
/>
<TextView
android:visibility="gone"
android:id="@+id/tv_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/common_text_color"
android:textSize="16sp"
android:text="北京大鱼创想科技有限公司"
android:textColor="@color/c9"
android:textSize="12sp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="20dp"
android:layout_marginBottom="10dp"
/>
</RelativeLayout>
......
beauty/src/main/java/com/tencent/liteav/demo/beauty/BeautyPanel.java
......@@ -196,7 +196,7 @@ public class BeautyPanel extends FrameLayout implements SeekBar.OnSeekBarChangeL
mBeautyDataList = new ArrayList<BeautyData>();
mBeautyDataList.add(new BeautyData(beauty_smooth, getResources().getString(R.string.beauty_pannel_style_smooth)));
mBeautyDataList.add(new BeautyData(beauty_natural, getResources().getString(R.string.beauty_pannel_style_natural)));
mBeautyDataList.add(new BeautyData(beauty_pitu, getResources().getString(R.string.beauty_pannel_style_pitu)));
// mBeautyDataList.add(new BeautyData(beauty_pitu, getResources().getString(R.string.beauty_pannel_style_pitu)));
mBeautyDataList.add(new BeautyData(beauty_white, getResources().getString(R.string.beauty_pannel_white)));
mBeautyDataList.add(new BeautyData(beauty_ruddy, getResources().getString(R.string.beauty_pannel_ruddy)));
// mBeautyDataList.add(new BeautyData(beauty_bigeye, getResources().getString(R.string.beauty_pannel_bigeye)));
......
beauty/src/main/res/values/arrays.xml
......@@ -13,7 +13,7 @@
<string-array name="beauty_style">
<item>美颜(光滑)</item>
<item>美颜(自然)</item>
<item>美颜(天天P图)</item>
<!--<item>美颜(天天P图)</item>-->
</string-array>
<string-array name="beauty_type">
......
liveModule/build.gradle
......@@ -35,7 +35,8 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs/upload')
implementation "com.android.support:appcompat-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'
// MLVB 需要依赖 okhttp 拦截器
implementation 'com.squareup.okhttp3:logging-interceptor:3.8.1'
// MLVB 需要使用 gson 进行 json 解析
......
liveModule/src/main/java/com/dayu/livemodule/MLVBLiveRoomImpl.java
......@@ -2922,6 +2922,42 @@ public class MLVBLiveRoomImpl extends MLVBLiveRoom implements HttpRequests.Heart
// }
// // 大主播
// {
// JSONObject layoutParam = new JSONObject();
// layoutParam.put("image_layer", 1);
//
// JSONObject mainStream = new JSONObject();
// mainStream.put("input_stream_id", mMainStreamId);
// mainStream.put("layout_params", layoutParam);
//
// inputStreamList.put(mainStream);
// }
//
// // 小主播
// for (String item : mSubStreamIds) {
// JSONObject layoutParam = new JSONObject();
// layoutParam.put("image_layer", 3);
// layoutParam.put("image_width", 480);
// layoutParam.put("image_height", 540);
// layoutParam.put("location_x", 480);
// layoutParam.put("location_y", 0);
//
// JSONObject cropParam = new JSONObject();
// cropParam.put("crop_width", 280);
// cropParam.put("crop_height", 320);
// cropParam.put("crop_x", 0);
// cropParam.put("crop_y", 0);
//
// JSONObject mainStream = new JSONObject();
// mainStream.put("input_stream_id", item);
// mainStream.put("layout_params", layoutParam);
// mainStream.put("crop_params", cropParam);
//
// inputStreamList.put(mainStream);
// }
// 画布
{
JSONObject layoutParam = new JSONObject();
......
liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/TCBaseAnchorActivity.java
......@@ -142,7 +142,8 @@ public class TCBaseAnchorActivity extends Activity implements IMLVBLiveRoomListe
RelativeLayout controllLayer = (RelativeLayout) findViewById(R.id.anchor_rl_controllLayer);
mTCSwipeAnimationController = new TCSwipeAnimationController(this);
mTCSwipeAnimationController.setAnimationView(controllLayer);
//左右滑动隐藏显示控制布局
// mTCSwipeAnimationController.setAnimationView(controllLayer);
mLvMessage = (ListView) findViewById(R.id.im_msg_listview);
mHeartLayout = (TCHeartLayout) findViewById(R.id.heart_layout);
......
liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/TCCameraAnchorActivity.java
......@@ -47,9 +47,9 @@ import java.util.Locale;
* Function: 主播推流的页面
* <p>
* <p>
* 1. MLVB 其他观众发起连麦请求处理：{@link TCCameraAnchorActivity2#onRequestJoinAnchor(AnchorInfo, String)}
* 1. MLVB 其他观众发起连麦请求处理：{@link TCCameraAnchorActivity#onRequestJoinAnchor(AnchorInfo, String)}
* <p>
* 2. MLVB 其他主播连麦，结束连麦处理：{@link TCCameraAnchorActivity2#onAnchorEnter(AnchorInfo)} {@link TCCameraAnchorActivity2#onAnchorExit(AnchorInfo)}
* 2. MLVB 其他主播连麦，结束连麦处理：{@link TCCameraAnchorActivity#onAnchorEnter(AnchorInfo)} {@link TCCameraAnchorActivity#onAnchorExit(AnchorInfo)}
* <p>
* 3. 音效控制面板类 {@link TCAudioControl}
* <p>
......@@ -71,6 +71,9 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity {
private TextView mBroadcastTime; // 已经开播的时间
private TextView mMemberCount; // 观众数量
private int baseUserCount = 0; //观众基数
View halfView;
......@@ -127,7 +130,7 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity {
mHeadIcon = (ImageView) findViewById(R.id.anchor_iv_head_icon);
showHeadIcon(mHeadIcon, TCUserMgr.getInstance().getAvatar());
mMemberCount = (TextView) findViewById(R.id.anchor_tv_member_counts);
mMemberCount.setText("0");
mMemberCount.setText(baseUserCount+"");
//AudioControl
mAudioCtrl = (TCAudioControl) findViewById(R.id.anchor_audio_control);
......@@ -598,14 +601,14 @@ public class TCCameraAnchorActivity extends TCBaseAnchorActivity {
//更新头像列表 返回false表明已存在相同用户，将不会更新数据
if (mAvatarListAdapter.addItem(userInfo))
super.handleMemberJoinMsg(userInfo);
mMemberCount.setText(String.format(Locale.CHINA, "%d", mCurrentMemberCount));
mMemberCount.setText(String.format(Locale.CHINA, "%d", mCurrentMemberCount+baseUserCount));
}
@Override
protected void handleMemberQuitMsg(TCSimpleUserInfo userInfo) {
mAvatarListAdapter.removeItem(userInfo.userid);
super.handleMemberQuitMsg(userInfo);
mMemberCount.setText(String.format(Locale.CHINA, "%d", mCurrentMemberCount));
mMemberCount.setText(String.format(Locale.CHINA, "%d", mCurrentMemberCount+baseUserCount));
}
......
liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/audience/TCAudienceActivity.java
......@@ -59,7 +59,6 @@ import com.tencent.rtmp.ui.TXCloudVideoView;
import org.greenrobot.eventbus.EventBus;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
......@@ -119,6 +118,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
private String mAvatar = ""; // 我的头像
private String mFileId = "";
private String mTimeStamp = "";
private int baseUserCount = 500; //观众基数
//头像列表控件
private RecyclerView mUserAvatarList;
......@@ -223,7 +223,8 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
mControlLayer = (RelativeLayout) findViewById(R.id.anchor_rl_controllLayer);
mTCSwipeAnimationController = new TCSwipeAnimationController(this);
mTCSwipeAnimationController.setAnimationView(mControlLayer);
//左右滑动隐藏显示控制布局
// mTCSwipeAnimationController.setAnimationView(mControlLayer);
mTXCloudVideoView = (TXCloudVideoView) findViewById(R.id.anchor_video_view);
mTXCloudVideoView.setLogMargin(10, 10, 45, 55);
......@@ -236,7 +237,8 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
findViewById(R.id.anchor_iv_record_ball).setVisibility(View.GONE);
mUserAvatarList = (RecyclerView) findViewById(R.id.anchor_rv_avatar);
mUserAvatarList.setVisibility(View.VISIBLE);
//隐藏头像列表
// mUserAvatarList.setVisibility(View.VISIBLE);
mAvatarListAdapter = new TCUserAvatarListAdapter(this, mPusherId);
mUserAvatarList.setAdapter(mAvatarListAdapter);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
......@@ -251,7 +253,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
mMemberCount = (TextView) findViewById(R.id.anchor_tv_member_counts);
mCurrentAudienceCount++;
mMemberCount.setText(String.format(Locale.CHINA,"%d", mCurrentAudienceCount));
mMemberCount.setText(String.format(Locale.CHINA,"%d", mCurrentAudienceCount+baseUserCount));
mChatMsgListAdapter = new TCChatMsgListAdapter(this, mListViewMsg, mArrayListChatEntity);
mListViewMsg.setAdapter(mChatMsgListAdapter);
......@@ -393,7 +395,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
if (mAvatarListAdapter.addItem(userInfo)){
if (addedCount != 0){
mCurrentAudienceCount++;
mMemberCount.setText(String.format(Locale.CHINA,"%d", mCurrentAudienceCount));
mMemberCount.setText(String.format(Locale.CHINA,"%d", mCurrentAudienceCount+baseUserCount));
}
addedCount+=1;
}
......@@ -716,7 +718,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
finish();
TCUtils.showKickOut(TCAudienceActivity.this);
} else {
showErrorAndQuit("视频流播放失败，Error:");
showErrorAndQuit("视频流播放失败，请稍后重试");
}
}
......@@ -757,7 +759,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
return;
mCurrentAudienceCount++;
mMemberCount.setText(String.format(Locale.CHINA,"%d", mCurrentAudienceCount));
mMemberCount.setText(String.format(Locale.CHINA,"%d", mCurrentAudienceCount+baseUserCount));
//左下角显示用户加入消息
TCChatEntity entity = new TCChatEntity();
......@@ -781,7 +783,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
else
Log.d(TAG, "接受多次退出请求，目前人数为负数");
mMemberCount.setText(String.format(Locale.CHINA,"%d", mCurrentAudienceCount));
mMemberCount.setText(String.format(Locale.CHINA,"%d", mCurrentAudienceCount+baseUserCount));
mAvatarListAdapter.removeItem(userInfo.userid);
......@@ -993,16 +995,16 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
public void onTextSend(String msg, boolean danmuOpen) {
if (msg.length() == 0)
return;
try {
byte[] byte_num = msg.getBytes("utf8");
if (byte_num.length > 160) {
Toast.makeText(this, "请输入内容", Toast.LENGTH_SHORT).show();
return;
}
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
return;
}
// try {
// byte[] byte_num = msg.getBytes("utf8");
// if (byte_num.length > 160) {
// Toast.makeText(this, "请输入内容", Toast.LENGTH_SHORT).show();
// return;
// }
// } catch (UnsupportedEncodingException e) {
// e.printStackTrace();
// return;
// }
//消息回显
TCChatEntity entity = new TCChatEntity();
......
liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/widget/TCInputTextMsgDialog.java
......@@ -42,7 +42,7 @@ public class TCInputTextMsgDialog extends Dialog {
private int mLastDiff = 0;
private LinearLayout mConfirmArea;
private OnTextSendListener mOnTextSendListener;
private boolean mDanmuOpen = false;
private boolean mDanmuOpen = true;
public TCInputTextMsgDialog(Context context, int theme) {
super(context, theme);
......@@ -69,7 +69,7 @@ public class TCInputTextMsgDialog extends Dialog {
messageTextView.setText("");
dismiss();
} else {
Toast.makeText(mContext, "请输入内容!", Toast.LENGTH_LONG).show();
Toast.makeText(mContext, "请输入内容!", Toast.LENGTH_SHORT).show();
}
messageTextView.setText(null);
}
......@@ -115,7 +115,7 @@ public class TCInputTextMsgDialog extends Dialog {
// messageTextView.setText("");
dismiss();
} else {
Toast.makeText(mContext, "请输入内容!", Toast.LENGTH_LONG).show();
Toast.makeText(mContext, "请输入内容!", Toast.LENGTH_SHORT).show();
}
return true;
case KeyEvent.KEYCODE_BACK:
......@@ -140,7 +140,7 @@ public class TCInputTextMsgDialog extends Dialog {
messageTextView.setText("");
dismiss();
} else {
Toast.makeText(mContext, "请输入内容!", Toast.LENGTH_LONG).show();
Toast.makeText(mContext, "请输入内容!", Toast.LENGTH_SHORT).show();
}
messageTextView.setText(null);
}
......
liveModule/src/main/res/layout/audio_ctrl.xml
......@@ -15,8 +15,9 @@
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:orientation="horizontal"
android:layout_gravity="right"
android:layout_marginTop="15dp">
<Button
......@@ -27,7 +28,6 @@
android:textSize="12dp"
android:focusable="false"
android:background="@drawable/round_button"
android:layout_marginLeft="15dp"
android:layout_marginBottom="15dp"
android:layout_above="@+id/seekBar_bgm_volume"/>
......@@ -40,6 +40,7 @@
android:focusable="false"
android:background="@drawable/round_button"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="15dp"
android:layout_toRightOf="@+id/btn_select_bgm"
android:layout_above="@+id/seekBar_bgm_volume" />
......
liveModule/src/main/res/layout/dialog_input_text.xml
......@@ -26,7 +26,7 @@
android:layout_marginLeft="10dp"
android:layout_height="25dp"
android:layout_marginRight="10dp"
android:background="@drawable/barrage_slider_off" />
android:background="@drawable/barrage_slider_on" />
</LinearLayout>
<View android:layout_width="0.5dp"
......@@ -46,7 +46,6 @@
android:imeActionId="@+id/login"
android:imeOptions="flagNoExtractUi"
android:inputType="text"
android:maxLength="32"
android:textColor="@color/black"
android:maxLines="1"
android:singleLine="true" />
......@@ -66,8 +65,8 @@
android:layout_height="wrap_content">
<Button
android:id="@+id/confrim_btn"
android:layout_width="50dp"
android:layout_height="30dp"
android:layout_width="60dp"
android:layout_height="match_parent"
android:background="@drawable/btn_send_message"
android:gravity="center"
android:textColor="@color/colorAccent"
......
saleCenter/src/main/res/layout/fragment_product_instruction.xml
......@@ -90,17 +90,6 @@
android:textColor="@color/cl_tab_gray" />
</LinearLayout>
<LinearLayout style="@style/sale_linearlayout_detail">
<TextView
style="@style/sale_detail_text"
android:text="@string/goods_desc" />
<TextView
android:id="@+id/tv_desc"
style="@style/sale_detail_text2"
android:maxLines="50" />
</LinearLayout>
<TextView
style="@style/sale_detail_text"
......@@ -119,6 +108,18 @@
android:layout_height="match_parent" />
</LinearLayout>
<LinearLayout style="@style/sale_linearlayout_detail">
<TextView
style="@style/sale_detail_text"
android:text="@string/goods_desc" />
<TextView
android:id="@+id/tv_desc"
style="@style/sale_detail_text2"
android:maxLines="50" />
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
......
umeng/build.gradle
......@@ -60,6 +60,8 @@ dependencies {
//vivo Push通道
api 'com.umeng.umsdk:vivo-push:2.3.1'
api 'com.umeng.umsdk:vivo-umengaccs:1.0.4'
// api 'com.umeng.umsdk:crash:0.0.4'
}
userCenter/src/main/res/layout/fragment_home_user.xml
......@@ -321,7 +321,7 @@
<TextView
style="@style/tv_user_bottom1"
android:layout_marginLeft="25dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="0dp"
android:text="可提现金额:" />
......@@ -331,17 +331,18 @@
android:layout_marginLeft="10dp"
android:layout_marginTop="0dp"
android:text="0"
android:textSize="16sp" />
android:textColor="@color/cl_order_item_date"
android:textSize="22sp" />
</LinearLayout>
<TextView
android:id="@+id/tv_fetch"
style="@style/btn_common"
android:layout_height="36dp"
android:layout_width="100dp"
android:layout_width="95dp"
android:layout_centerVertical="true"
android:background="@drawable/btn_blue_commom"
android:layout_alignParentRight="true"
android:layout_marginRight="20dp"
android:layout_marginRight="15dp"
android:text="@string/apply_fetch" />
</RelativeLayout>
......
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