1
This commit is contained in:
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -7,10 +7,8 @@ import androidx.recyclerview.widget.RecyclerView;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import com.yunbao.beauty.bean.FilterBean;
|
||||
import com.yunbao.common.views.AbsViewHolder;
|
||||
import com.yunbao.video.R;
|
||||
import com.yunbao.beauty.adapter.FilterAdapter;
|
||||
import com.yunbao.common.interfaces.OnItemClickListener;
|
||||
import com.yunbao.common.utils.BitmapUtil;
|
||||
|
||||
@@ -19,7 +17,7 @@ import com.yunbao.common.utils.BitmapUtil;
|
||||
* 视频编辑 滤镜
|
||||
*/
|
||||
|
||||
public class VideoEditFilterViewHolder extends AbsViewHolder implements OnItemClickListener<FilterBean>, View.OnClickListener {
|
||||
public class VideoEditFilterViewHolder extends AbsViewHolder {
|
||||
|
||||
private ActionListener mActionListener;
|
||||
private boolean mShowed;
|
||||
@@ -37,35 +35,12 @@ public class VideoEditFilterViewHolder extends AbsViewHolder implements OnItemCl
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
findViewById(R.id.root).setOnClickListener(this);
|
||||
RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recyclerView);
|
||||
recyclerView.setHasFixedSize(true);
|
||||
recyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false));
|
||||
FilterAdapter adapter = new FilterAdapter(mContext);
|
||||
adapter.setOnItemClickListener(this);
|
||||
recyclerView.setAdapter(adapter);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemClick(FilterBean bean, int position) {
|
||||
if (mBitmap != null) {
|
||||
mBitmap.recycle();
|
||||
}
|
||||
if (mActionListener != null) {
|
||||
int filterSrc = bean.getFilterSrc();
|
||||
if (filterSrc != 0) {
|
||||
Bitmap bitmap = BitmapUtil.getInstance().decodeBitmap(filterSrc);
|
||||
if (bitmap != null) {
|
||||
mBitmap = bitmap;
|
||||
mActionListener.onFilterChanged(bitmap);
|
||||
} else {
|
||||
mActionListener.onFilterChanged(null);
|
||||
}
|
||||
} else {
|
||||
mActionListener.onFilterChanged(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void show() {
|
||||
mShowed = true;
|
||||
@@ -84,10 +59,6 @@ public class VideoEditFilterViewHolder extends AbsViewHolder implements OnItemCl
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
hide();
|
||||
}
|
||||
|
||||
public interface ActionListener {
|
||||
void onHide();
|
||||
|
||||
@@ -5,7 +5,6 @@ import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.yunbao.beauty.custom.TextSeekBar;
|
||||
import com.yunbao.common.utils.StringUtil;
|
||||
import com.yunbao.common.views.AbsViewHolder;
|
||||
import com.yunbao.video.R;
|
||||
@@ -23,8 +22,6 @@ public class VideoEditMusicViewHolder extends AbsViewHolder implements View.OnCl
|
||||
private TextView mStartTime;//起始时间
|
||||
private TextView mEndTime;//结束时间
|
||||
private RangeSlider mRangeSlider;
|
||||
private TextSeekBar mOriginSeekBar;//原声
|
||||
private TextSeekBar mBgmSeekBar;//背景音
|
||||
private TextView mMusicName;//音乐名称
|
||||
private ActionListener mActionListener;
|
||||
private boolean mShowed;
|
||||
@@ -78,28 +75,7 @@ public class VideoEditMusicViewHolder extends AbsViewHolder implements View.OnCl
|
||||
});
|
||||
findViewById(R.id.root).setOnClickListener(this);
|
||||
findViewById(R.id.btn_cancel).setOnClickListener(this);
|
||||
mOriginSeekBar = (TextSeekBar) findViewById(R.id.btn_origin);
|
||||
mBgmSeekBar = (TextSeekBar) findViewById(R.id.seek_bgm);
|
||||
TextSeekBar.OnSeekChangeListener seekChangeListener = new TextSeekBar.OnSeekChangeListener() {
|
||||
@Override
|
||||
public void onProgressChanged(View v, int progress) {
|
||||
if (mActionListener != null) {
|
||||
int i = v.getId();
|
||||
if (i == R.id.btn_origin) {
|
||||
mActionListener.onOriginalVolumeChanged(progress / 100f);
|
||||
} else if (i == R.id.seek_bgm) {
|
||||
mActionListener.onBgmVolumeChanged(progress / 100f);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
mOriginSeekBar.setOnSeekChangeListener(seekChangeListener);
|
||||
mBgmSeekBar.setOnSeekChangeListener(seekChangeListener);
|
||||
|
||||
if (mBgmSeekBar != null) {
|
||||
mBgmSeekBar.setProgress(0);
|
||||
mBgmSeekBar.setEnabled(false);
|
||||
}
|
||||
|
||||
if (mCurMusicBean != null) {
|
||||
setMusicBean(mCurMusicBean);
|
||||
@@ -120,16 +96,7 @@ public class VideoEditMusicViewHolder extends AbsViewHolder implements View.OnCl
|
||||
mMusicName.setText(bean.getTitle());
|
||||
}
|
||||
//如果在录制的时候有背景音,则要把原声禁用
|
||||
if (mHasOriginBgm) {
|
||||
if (mOriginSeekBar != null) {
|
||||
mOriginSeekBar.setEnabled(false);
|
||||
mOriginSeekBar.setProgress(0);
|
||||
}
|
||||
}
|
||||
if (mBgmSeekBar != null) {
|
||||
mBgmSeekBar.setProgress(80);
|
||||
mBgmSeekBar.setEnabled(true);
|
||||
}
|
||||
|
||||
if (mRangeSlider != null) {
|
||||
mRangeSlider.resetRangePos();
|
||||
}
|
||||
@@ -144,14 +111,7 @@ public class VideoEditMusicViewHolder extends AbsViewHolder implements View.OnCl
|
||||
if (mCutGroup != null && mCutGroup.getVisibility() == View.VISIBLE) {
|
||||
mCutGroup.setVisibility(View.GONE);
|
||||
}
|
||||
if (mOriginSeekBar != null) {
|
||||
mOriginSeekBar.setProgress(80);
|
||||
mOriginSeekBar.setEnabled(true);
|
||||
}
|
||||
if (mBgmSeekBar != null) {
|
||||
mBgmSeekBar.setProgress(0);
|
||||
mBgmSeekBar.setEnabled(false);
|
||||
}
|
||||
|
||||
if (mActionListener != null) {
|
||||
mActionListener.onBgmCancelClick();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user