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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
18142669586
2022-09-28 16:26:13 +08:00
parent 45d9b914a9 6aaadb6e9a
commit a066d3f4ff
36 changed files with 173 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/com/yunbao/main/activity/PDLiveConversationListActivity.java
View File

@@ -146,7 +146,7 @@ public class PDLiveConversationListActivity extends AbsActivity implements View.
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
guidSvga.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(guidSvga);
SVGAViewUtils.playEndClear(guidSvga,false);
}
@Override

18
main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
View File

@@ -302,6 +302,24 @@ public class ZhuangBanActivity extends AbsActivity {
intent.putExtra("isFull", false);
mContext.startActivity(intent);
}
/**
* 新跳转
*
* @param url 跳转的url
* @param title 有标题的展示标题
*/
@JavascriptInterface
public void androidClickToNewH5PageView(String url, String title) {
url = CommonAppConfig.HOST + url;
url += "?uid=" + CommonAppConfig.getInstance().getUid() + "&token="
+ CommonAppConfig.getInstance().getToken();
Log.i("tag", url);
Intent intent = new Intent(mContext, com.yunbao.live.activity.ZhuangBanActivity.class);
intent.putExtra("url", url);
intent.putExtra("title", title);
mContext.startActivity(intent);
}
/**
* 设置超皇字体颜色

11
main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java
View File

@@ -288,7 +288,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
svga1.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(svga1);
SVGAViewUtils.playEndClear(svga1,false);
}
@Override
@@ -311,10 +311,12 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
mName1.setText(R.string.mystery_man);
ImgLoader.display(mContext, R.mipmap.hide, mAvatar1);
mSex1.setVisibility(View.GONE);
svga1.setVisibility(View.GONE);
} else {
ImgLoader.display(mContext, bean.getAvatarThumb(), mAvatar1);
mName1.setText(bean.getUserNiceName());
mSex1.setVisibility(View.VISIBLE);
svga1.setVisibility(View.VISIBLE);
}
mVotes1.setText(bean.getTotalCoinFormat());
@@ -363,7 +365,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
svga2.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(svga2);
SVGAViewUtils.playEndClear(svga2,false);
}
@Override
@@ -411,6 +413,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
liveing2.setVisibility(View.INVISIBLE);
}
mBtnFollow2.setVisibility(bean.isHide() ? View.GONE : View.VISIBLE);
svga2.setVisibility(bean.isHide() ? View.GONE : View.VISIBLE);
if (bean.getAttention() == 1) {
mBtnFollow2.doChecked(true);
mBtnFollow2.setText(mFollowing);
@@ -438,7 +441,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
svga3.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(svga3);
SVGAViewUtils.playEndClear(svga3,false);
}
@Override
@@ -486,6 +489,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
liveing3.setVisibility(View.INVISIBLE);
}
mBtnFollow3.setVisibility(bean.isHide() ? View.GONE : View.VISIBLE);
svga3.setVisibility(bean.isHide() ? View.GONE : View.VISIBLE);
if (bean.getAttention() == 1) {
mBtnFollow3.doChecked(true);
mBtnFollow3.setText(mFollowing);
@@ -587,6 +591,7 @@ public class MainListAdapter extends RefreshAdapter<ListBean> {
liveing.setVisibility(View.INVISIBLE);
}
mBtnFollow.setVisibility(bean.isHide() ? View.GONE : View.VISIBLE);
svga.setVisibility(bean.isHide() ? View.GONE : View.VISIBLE);
mBtnFollow.setTag(position);
if (bean.getAttention() == 1) {
mBtnFollow.doChecked(true);

4
main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java
View File

@@ -14,6 +14,7 @@ import com.squareup.picasso.Picasso;
import com.yunbao.common.Constants;
import com.yunbao.common.custom.RatioRoundImageView;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.formatBigNum;
import com.yunbao.live.bean.LiveBean;
import com.yunbao.main.R;
@@ -127,6 +128,7 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder {
liveType.setVisibility(View.VISIBLE);
Picasso.with(mContext)
.load(bean.getRecommendCardIcon())
.resize(DpUtil.dp2px(80),DpUtil.dp2px(33))
.into(liveType);
}
viewBg.setImageResource(R.mipmap.emperor_recommendation);
@@ -136,7 +138,9 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder {
if (!TextUtils.isEmpty(bean.getRecommendCardIcon())) {
liveType.setVisibility(View.VISIBLE);
Picasso.with(mContext)
.load(bean.getRecommendCardIcon())
.resize(DpUtil.dp2px(80),DpUtil.dp2px(33))
.into(liveType);
}
viewBg.setImageResource(R.mipmap.superemperor_recommendation);

3
main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
View File

@@ -211,7 +211,8 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
new_data = JSON.parseArray(Arrays.toString(info), LiveBean.class);
}
}
// new_data.clear();
// mBannerList.clear();
return new_data;
}

2
main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java
View File

@@ -67,7 +67,7 @@ public class MainHomeLiveWeekItemViewHolder<T> extends RecyclerView.ViewHolder {
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
weekSvga.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(weekSvga);
SVGAViewUtils.playEndClear(weekSvga,false);
weekSvga.setClearsAfterStop(false);
}

2
main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
View File

@@ -313,7 +313,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
gift_svga.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(gift_svga);
SVGAViewUtils.playEndClear(gift_svga,false);
}
@Override

12
main/src/main/res/layout/view_main_home.xml
View File

@@ -42,13 +42,13 @@
android:id="@+id/img_trophy"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="2dp"
android:layout_marginRight="5dp"
android:onClick="mainClick"
android:layout_alignParentRight="true"
android:padding="6dp"
android:contentDescription="TODO" />
android:layout_alignParentBottom="true"
android:layout_marginRight="5dp"
android:layout_marginBottom="2dp"
android:contentDescription="TODO"
android:onClick="mainClick"
android:padding="6dp" />
<FrameLayout
android:layout_width="match_parent"