yutou/pdlivexp
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
commit a066d3f4ff
36 changed files with 173 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java
View File

@ -386,7 +386,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
imageView.setBackgroundColor(0xffffffff);
mImageViewList.add(imageView);
ImgLoader.display(mContext, mAdList.get(i).getUrl(), imageView,480,960);
ImgLoader.display(mContext, mAdList.get(i).getUrl(), imageView);
}
for (int i = imgSize - 1; i >= 0; i--) {
mContainer.addView(mImageViewList.get(i));

9
common/src/main/java/com/yunbao/common/utils/SVGAViewUtils.java
View File

@ -4,7 +4,7 @@ import com.opensource.svgaplayer.SVGACallback;
import com.opensource.svgaplayer.SVGAImageView;
public class SVGAViewUtils {
public static void playEndClear(SVGAImageView svga){
public static void playEndClear(SVGAImageView svga,boolean isClear){
svga.setCallback(new SVGACallback() {
@Override
public void onPause() {
@ -14,7 +14,9 @@ public class SVGAViewUtils {
@Override
public void onFinished() {
//动画结束后调用clear释放资源
svga.clear();
if(isClear) {
svga.clear();
}
}
@Override
@ -29,4 +31,7 @@ public class SVGAViewUtils {
});
svga.startAnimation();
}
public static void playEndClear(SVGAImageView svga){
playEndClear(svga,true);
}
}

2
common/src/main/java/com/yunbao/common/views/CustomViewHolder.java
View File

@ -22,7 +22,7 @@ public class CustomViewHolder implements BannerViewHolder<BannerBean> {
imageView.setLayoutParams(params);
imageView.setScaleType(ImageView.ScaleType.FIT_XY);
//Glide.with(context).load(data.getImageUrl()).into(imageView);
ImgLoader.display(context,data.getImageUrl(),imageView,600,170);
ImgLoader.display(context,data.getImageUrl(),imageView);
return imageView;
}

6
common/src/main/res/layout/dialog_live_new_function.xml
View File

@ -104,7 +104,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="30dp"
android:text="@string/basic_tools"
android:text="@string/live_config"
android:textColor="@color/white"
android:textSize="14sp" />
@ -196,7 +196,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:text="@string/live_config"
android:text="@string/basic_tools"
android:textColor="@color/white"
android:textSize="14sp" />
@ -264,7 +264,7 @@
android:layout_marginStart="23dp"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
android:visibility="visible">
<ImageView
android:layout_width="40dp"

BIN
common/src/main/res/mipmap-xxhdpi/icon_live_ready_camera.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 809 B

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_weekstar.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_xinyuandan.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_zhenggu.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 18 KiB

2
common/src/main/res/values/strings.xml
View File

@ -212,7 +212,7 @@
<string name="live_cover_2">更換封面</string>
<string name="live_title">直播標題</string>
<string name="live_title_hint">給直播寫個標題吧</string>
<string name="live_class">頻道</string>
<string name="live_class">選擇頻道</string>
<string name="live_class_choose">選擇直播頻道</string>
<string name="live_class_tip_title">注意選擇適合自己的頻道。</string>
<string name="live_class_tip">直播過程中，若運營人員發現選擇的頻道和直播內容不相符的情况，會調整您的直播頻道。</string>

2
live/src/main/java/com/yunbao/live/activity/LiveActivity.java
View File

@ -1244,7 +1244,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
.getNobleRankHideUserList(new com.yunbao.common.http.base.HttpCallback<NobleRankHideUserListModel>() {
@Override
public void onSuccess(NobleRankHideUserListModel data) {
outRankHide = data.getOutRankHide();
outRankHide = data.getInRankHide();
LiveUserMoreDialogFragment fragment = new LiveUserMoreDialogFragment();
fragment.setLiveGuardInfo(mLiveGuardInfo);
Bundle bundle = new Bundle();

32
live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
View File

@ -35,6 +35,7 @@ import com.tencent.trtc.TRTCCloudDef;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.dialog.NotCancelableDialog;
import com.yunbao.common.event.LoginInvalidEvent;
@ -43,6 +44,8 @@ import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient;
import com.yunbao.common.http.JsonBean;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DateFormatUtil;
import com.yunbao.common.utils.DialogUitl;
import com.yunbao.common.utils.DpUtil;
@ -62,7 +65,9 @@ import com.yunbao.live.dialog.LiveLinkMicListDialogFragment;
import com.yunbao.live.dialog.LiveMicUserDialogFragment;
import com.yunbao.live.dialog.LiveNewFunctionDialogFragment;
import com.yunbao.live.dialog.LiveNewWishListDialogFragment;
import com.yunbao.live.dialog.LiveWishListDialogFragment4Audience;
import com.yunbao.live.event.LinkMicTxMixStreamEvent;
import com.yunbao.live.event.LiveAudienceEvent;
import com.yunbao.live.http.LiveHttpConsts;
import com.yunbao.live.http.LiveHttpUtil;
import com.yunbao.live.interfaces.LiveFunctionClickListener;
@ -147,6 +152,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
@Override
protected void main() {
super.main();
Bus.getOn(this);
Intent intent = getIntent();
mLiveSDK = intent.getIntExtra(Constants.LIVE_SDK, Constants.LIVE_SDK_KSY);
mLiveKsyConfigBean = intent.getParcelableExtra(Constants.LIVE_KSY_CONFIG);
@ -223,6 +229,8 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
ToastUtil.show("開發中，敬請期待");
break;
case Constants.LIVE_FUNC_MIC://語音
ToastUtil.show("開發中，敬請期待");
/* //连麦说是有问题，暂时隐藏
LiveMicUserDialogFragment fragment = new LiveMicUserDialogFragment();
Bundle bundle = new Bundle();
bundle.putString(Constants.LIVE_UID, mLiveUid);
@ -230,7 +238,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
bundle.putString("By", "1");
fragment.setArguments(bundle);
fragment.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveUserMoreDialogFragment");
LiveMicUserDialogFragment.activity = ((LiveRyAnchorActivity) mContext);
LiveMicUserDialogFragment.activity = ((LiveRyAnchorActivity) mContext);*/
break;
case Constants.LIVE_FUNC_DR://多人PK
if (isDRPK != 1) {
@ -889,6 +897,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
mLiveReadyViewHolder=null;
mLiveAnchorViewHolder=null;
L.e("LiveAnchorActivity-------onDestroy------->");
Bus.getOff(this);
}
@ -1275,4 +1284,25 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
L.e(TAG, content);
LogUtil.print(mLogFile, content);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onOpenDrawer(LiveAudienceEvent event) {
Bundle bundle = new Bundle();
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
switch (event.getType()) {
case LIVE_WKS:
String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid="
+ userInfo.getId() +
"&token=" + userInfo.getToken() + "&anchorUid=" + mLiveUid;
ZhuangBanActivity.forward(mContext, weeklyStarUrl, false);
break;
case WISH_LIST:
LiveWishListDialogFragment4Audience fragment4Audience = new LiveWishListDialogFragment4Audience();
bundle.putString(Constants.LIVE_UID, mLiveUid);
fragment4Audience.setArguments(bundle);
if (mContext instanceof LiveRyAnchorActivity) {
fragment4Audience.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveWishListDialogFragment4Audience");
}
break;
}
}
}

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

23
live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java
View File

@ -244,15 +244,7 @@ public class UserMoreInfoAdapter extends RefreshAdapter<UserBean> {
mRanksIcon.addView(rankImage, 0);
}
}
if (bean.isHide() && (type.equals("5") || type.equals("4"))) {
mName.setText(R.string.mystery_man);
ImgLoader.display(mContext, R.mipmap.hide, mAvatar);
itemView.findViewById(R.id.state).setVisibility(View.GONE);
} else {
ImgLoader.display(mContext, bean.getAvatar(), mAvatar);
mName.setText(bean.getUserNiceName());
itemView.findViewById(R.id.state).setVisibility(View.VISIBLE);
}
if (bean.getDress() != null && bean.getDress().getAvatar_frame() != null) {
gift_svga.setVisibility(View.VISIBLE);
if (bean.getDress().getAvatar_frame().contains("svga")) {
@ -262,7 +254,7 @@ public class UserMoreInfoAdapter extends RefreshAdapter<UserBean> {
public void onComplete(SVGAVideoEntity videoItem) {
SVGADrawable drawable = new SVGADrawable(videoItem);
gift_svga.setImageDrawable(drawable);
SVGAViewUtils.playEndClear(gift_svga);
SVGAViewUtils.playEndClear(gift_svga,false);
}
@Override
@ -291,6 +283,17 @@ public class UserMoreInfoAdapter extends RefreshAdapter<UserBean> {
if (levelBean != null) {
ImgLoader.display(mContext, levelBean.getThumb(), mLevel);
}
if (bean.isHide() && (type.equals("5") || type.equals("4"))) {
mName.setText(R.string.mystery_man);
ImgLoader.display(mContext, R.mipmap.hide, mAvatar);
itemView.findViewById(R.id.state).setVisibility(View.GONE);
gift_svga.setVisibility(View.GONE);
} else {
ImgLoader.display(mContext, bean.getAvatar(), mAvatar);
mName.setText(bean.getUserNiceName());
itemView.findViewById(R.id.state).setVisibility(View.VISIBLE);
gift_svga.setVisibility(View.VISIBLE);
}
}
/**

8
live/src/main/java/com/yunbao/live/bean/LiveBean.java
View File

@ -64,14 +64,14 @@ public class LiveBean implements Parcelable {
}
public String getRecommendCardIcon() {
if (TextUtils.isEmpty(recommendCardIconSizeTwo)) {
if (!TextUtils.isEmpty(recommendCardIconSizeThree)) {
return recommendCardIconSizeThree;
if (TextUtils.isEmpty(recommendCardIconSizeThree)) {
if (!TextUtils.isEmpty(recommendCardIconSizeTwo)) {
return recommendCardIconSizeTwo;
} else {
return null;
}
} else {
return recommendCardIconSizeTwo;
return recommendCardIconSizeThree;
}
}

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) {

6
live/src/main/res/layout/activity_pd_chat.xml
View File

@ -38,8 +38,11 @@
<LinearLayout
android:id="@+id/lt_nodata_msg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="400dp"
android:layout_marginTop="-10dp"
android:layout_below="@id/top_card"
android:layout_centerVertical="true"
android:background="@color/white"
android:gravity="center"
android:visibility="visible">
@ -48,4 +51,5 @@
android:layout_height="wrap_content"
android:src="@mipmap/img_no_new" />
</LinearLayout>
</RelativeLayout>

2
live/src/main/res/layout/dialog_new_live_room_class.xml
View File

@ -22,7 +22,7 @@
android:id="@+id/textView2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="30dp"
android:layout_marginStart="5dp"
android:layout_marginTop="10dp"
android:text="@string/live_class_tip_title"
android:textColor="#F6F7FB"

10
live/src/main/res/layout/dialog_new_live_room_type.xml
View File

@ -5,7 +5,7 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#b3000000">
android:background="#000000">
<TextView
android:id="@+id/title"
@ -33,8 +33,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/public_room"
android:layout_width="166dp"
android:layout_height="162dp"
android:layout_width="146dp"
android:layout_height="142dp"
android:layout_marginStart="24dp"
android:layout_marginTop="54dp"
android:layout_marginBottom="33dp"
@ -90,8 +90,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/private_room"
android:layout_width="166dp"
android:layout_height="162dp"
android:layout_width="146dp"
android:layout_height="142dp"
android:layout_marginTop="54dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="33dp"

8
live/src/main/res/layout/dialog_new_live_wishlist.xml
View File

@ -38,7 +38,7 @@
android:layout_centerInParent="true"
android:layout_gravity="center"
android:layout_marginTop="24dp"
android:layout_marginEnd="90dp"
android:layout_marginEnd="70dp"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/live_item_add_gift"
@ -53,14 +53,14 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
<com.yunbao.common.custom.CommonRefreshView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="18dp"
android:overScrollMode="never"
android:layout_marginBottom="28dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

14
live/src/main/res/layout/item_new_live_wish_list.xml
View File

@ -22,8 +22,8 @@
android:layout_gravity="center"
android:layout_marginLeft="18dp"
android:layout_marginRight="15dp"
android:text="心愿"
android:textColor="@color/white"
android:text="心願"
android:textColor="#704DF3"
android:textSize="12sp" />
@ -77,7 +77,7 @@
<ProgressBar
android:id="@+id/pb_wishlist"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="100dp"
android:layout_width="80dp"
android:layout_height="10dp"
android:layout_centerVertical="true"
android:layout_gravity="center"
@ -95,19 +95,19 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="24dp"
android:layout_marginStart="10dp"
android:layout_marginTop="2dp"
android:layout_weight="1"
android:gravity="center"
android:text="1/1"
android:textColor="@color/white"
android:textSize="14sp"
android:textSize="12sp"
app:layout_constraintStart_toEndOf="@+id/pb_wishlist"
app:layout_constraintTop_toBottomOf="@+id/name" />
<LinearLayout
android:id="@+id/llNum"
android:layout_width="70dp"
android:layout_width="80dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
@ -138,7 +138,7 @@
android:maxLength="5"
android:text="x1"
android:textColor="#FFFFFF"
android:textSize="12sp" />
android:textSize="10sp" />
<TextView
android:id="@+id/tv_increase"

18
live/src/main/res/layout/view_live_room.xml
View File

@ -646,7 +646,7 @@
android:text="00:00"
android:textColor="@color/white"
android:textSize="10sp"
android:visibility="gone"
android:visibility="invisible"
app:dt_left_drawable="@drawable/bg_push_time_point"
app:dt_left_height="4dp"
app:dt_left_width="4dp" />
@ -655,7 +655,7 @@
android:id="@+id/goto_room_view"
android:layout_width="wrap_content"
android:layout_height="27dp"
android:layout_below="@id/lin"
android:layout_below="@id/open_sidebar"
android:layout_alignParentRight="true"
android:layout_marginTop="16dp"
android:layout_marginRight="9dp"
@ -948,7 +948,7 @@
<LinearLayout
android:id="@+id/gif_gift_tip_group"
android:layout_width="wrap_content"
android:visibility="gone"
android:visibility="invisible"
android:layout_height="26dp"
android:layout_below="@id/hour_rank_layout"
android:layout_marginLeft="10dp"
@ -987,7 +987,7 @@
android:id="@+id/gif_gift_tip_group_all_server"
android:layout_width="match_parent"
android:layout_height="36dp"
android:visibility="gone"
android:visibility="invisible"
android:translationX="500dp">
<LinearLayout
@ -1060,7 +1060,7 @@
<FrameLayout
android:id="@+id/gif_gift_tip_group_buy_guard"
android:layout_width="match_parent"
android:visibility="gone"
android:visibility="invisible"
android:layout_height="36dp"
android:translationX="500dp">
@ -1135,7 +1135,7 @@
android:id="@+id/gif_gift_tip_group_buy_zuoji"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:visibility="gone"
android:visibility="invisible"
android:layout_marginLeft="10dp"
android:layout_marginTop="100dp"
android:translationX="500dp">
@ -1187,7 +1187,7 @@
android:id="@+id/gif_gift_tip_group_buy_liang_name"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:visibility="gone"
android:visibility="invisible"
android:layout_marginLeft="10dp"
android:layout_marginTop="135dp"
android:translationX="500dp">
@ -1238,7 +1238,7 @@
<FrameLayout
android:id="@+id/gif_gift_tip_group_buy_vip"
android:layout_width="match_parent"
android:visibility="gone"
android:visibility="invisible"
android:layout_height="36dp"
android:translationX="500dp">
@ -1981,7 +1981,7 @@
android:id="@+id/enter_room_svg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
android:scaleType="fitCenter" />
<RelativeLayout
android:id="@+id/inner_container"

2
live/src/main/res/layout/view_new_live_ready.xml
View File

@ -80,7 +80,7 @@
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_weight="1"
android:text="@string/live_room_type"
android:text="@string/live_room_public"
android:textColor="@color/white"
android:textSize="12sp" />

BIN
live/src/main/res/mipmap-xxxhdpi/emperor_rom.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/super_emperor_rom.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 21 KiB

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"