yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取消Banner和开盘图片的裁切

Browse Source 
修复主播直播间合集名字、图标错误
调整直播准备间文案
调整直播准备心愿单列表
调整直播间遮罩
调整进场动画svga动画
修复观众及个人中心头像svga闪烁和消失问题
This commit is contained in:
zlzw
2022-09-28 14:08:05 +08:00
parent 8d98c6b5cc
commit c45cc7a990
24 changed files with 81 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
live/src/main/java/com/yunbao/live/adapter/LiveNewWishListAdapter.java
View File

@@ -106,7 +106,7 @@ public class LiveNewWishListAdapter extends RecyclerView.Adapter<LiveNewWishList
itemView.setTag(bean);
ImgLoader.display(mContext, bean.getWishlist_icon(), mIcon);
mName.setText(bean.getWishlist_name());
mNum.setText(bean.getWishlist_num());
mNum.setText("x"+bean.getWishlist_num());
int pro = 0;
try {
int num1 = Integer.parseInt(bean.getWishlist_progress());
@@ -182,7 +182,7 @@ public class LiveNewWishListAdapter extends RecyclerView.Adapter<LiveNewWishList
if (num <= 0) {
ToastUtil.show("数字必须大于0");
} else {
mNum.setText(num + "");
mNum.setText("x"+num);
bean.setWishlist_num(num + "");
}
}
@@ -199,10 +199,11 @@ public class LiveNewWishListAdapter extends RecyclerView.Adapter<LiveNewWishList
@Override
public void onClick(View v) {
try {
int num = Integer.parseInt(mNum.getText().toString());
int num = Integer.parseInt(mNum.getText().toString().replace("x",""));
num++;
mNum.setText("x"+num );
bean.setWishlist_num(num + "");
tvProgress.setText(bean.getWishlist_progress() + "/" +num);
} catch (Exception e) {
e.printStackTrace();
}
@@ -215,11 +216,12 @@ public class LiveNewWishListAdapter extends RecyclerView.Adapter<LiveNewWishList
@Override
public void onClick(View v) {
try {
int num = Integer.parseInt(mNum.getText().toString());
int num = Integer.parseInt(mNum.getText().toString().replace("x",""));
if (num > 1) {
num--;
mNum.setText("x"+num );
bean.setWishlist_num(num + "");
tvProgress.setText(bean.getWishlist_progress() + "/" +num);
}
} catch (Exception e) {

2
live/src/main/java/com/yunbao/live/adapter/LiveUserAdapter.java
View File

@@ -126,7 +126,7 @@ public class LiveUserAdapter extends RecyclerView.Adapter<LiveUserAdapter.Vh> {
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
gift_svga.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(gift_svga);
SVGAViewUtils.playEndClear(gift_svga,false);
}
@Override

40
live/src/main/java/com/yunbao/live/dialog/LiveBeautyDialogFragment.java
View File

@@ -91,12 +91,12 @@ public class LiveBeautyDialogFragment extends AbsDialogFragment {
@Override
protected int getDialogStyle() {
return R.style.dialog2;
return R.style.dialog4;
}
@Override
protected boolean canCancel() {
return false;
return true;
}
@Override
@@ -250,19 +250,7 @@ public class LiveBeautyDialogFragment extends AbsDialogFragment {
close_btn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Gson gson = new Gson();
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putString("face", gson.toJson(beautyFaceList));
editor.putString("beautiful", gson.toJson(beautifulList));
editor.putString("filter", gson.toJson(filterList));
editor.commit();
dismiss();
if (LiveAnchorActivity.mLiveReadyViewHolder != null) {
LiveAnchorActivity.mLiveReadyViewHolder.show();
}
if (LiveRyAnchorActivity.mLiveReadyViewHolder != null) {
LiveRyAnchorActivity.mLiveReadyViewHolder.show();
}
close();
}
});
LinearLayoutManager manager = new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false);
@@ -584,4 +572,26 @@ public class LiveBeautyDialogFragment extends AbsDialogFragment {
}
@Override
public void onDismiss(DialogInterface dialog) {
super.onDismiss(dialog);
close();
}
private void close(){
Gson gson = new Gson();
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putString("face", gson.toJson(beautyFaceList));
editor.putString("beautiful", gson.toJson(beautifulList));
editor.putString("filter", gson.toJson(filterList));
editor.commit();
dismiss();
if (LiveAnchorActivity.mLiveReadyViewHolder != null) {
LiveAnchorActivity.mLiveReadyViewHolder.show();
}
if (LiveRyAnchorActivity.mLiveReadyViewHolder != null) {
LiveRyAnchorActivity.mLiveReadyViewHolder.show();
}
}
}

2
live/src/main/java/com/yunbao/live/dialog/LiveNewRoomClassDialogFragment.java
View File

@@ -36,7 +36,7 @@ public class LiveNewRoomClassDialogFragment extends AbsDialogFragment implements
@Override
protected int getDialogStyle() {
return R.style.dialog2;
return R.style.dialog4;
}
@Override

2
live/src/main/java/com/yunbao/live/dialog/LiveNewRoomTypeDialogFragment.java
View File

@@ -45,7 +45,7 @@ public class LiveNewRoomTypeDialogFragment extends AbsDialogFragment implements
@Override
protected int getDialogStyle() {
return R.style.dialog2;
return R.style.dialog4;
}
@Override

8
live/src/main/java/com/yunbao/live/dialog/LiveNewWishListDialogFragment.java
View File

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.yunbao.common.bean.LiveGiftBean;
import com.yunbao.common.custom.CommonRefreshView;
import com.yunbao.common.dialog.AbsDialogFragment;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
@@ -41,7 +42,7 @@ import java.util.List;
public class LiveNewWishListDialogFragment extends AbsDialogFragment implements OnItemClickListener<LiveWishlistBean> {
private RecyclerView mRecyclerView;
private CommonRefreshView mRecyclerView;
private ActionListener mActionListener;
private boolean mNoLink;
private View mrlAdd, tvDone;
@@ -78,8 +79,7 @@ public class LiveNewWishListDialogFragment extends AbsDialogFragment implements
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
mRecyclerView = (RecyclerView) mRootView.findViewById(R.id.recyclerView);
mRecyclerView.setHasFixedSize(true);
mRecyclerView = (CommonRefreshView) mRootView.findViewById(R.id.recyclerView);
mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
mrlAdd = findViewById(R.id.rl_add);
tvDone = findViewById(R.id.tvDone);
@@ -145,7 +145,7 @@ public class LiveNewWishListDialogFragment extends AbsDialogFragment implements
mWishlist = JSON.parseArray(giftJson, LiveWishlistBean.class);
mAdapter = new LiveNewWishListAdapter(mContext, mNoLink);
mAdapter.setData(mWishlist);
mRecyclerView.setAdapter(mAdapter);
mRecyclerView.mRecyclerView.setAdapter(mAdapter);
mAdapter.setOnItemClickListener(new OnItemClickListener<LiveWishlistBean>() {
@Override
public void onItemClick(LiveWishlistBean bean, int position) {