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

新增直播间轮播Banner

Browse Source 
调整身份特权弹窗
This commit is contained in:
zlzw
2022-10-26 16:34:53 +08:00
parent c725be7bbc
commit 38d2e0df57
26 changed files with 444 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/main/java/com/yunbao/common/bean/BannerBean.java
View File

@@ -81,4 +81,17 @@ public class BannerBean {
public void setType(int type) {
this.type = type;
}
@Override
public String toString() {
return "BannerBean{" +
"isStart=" + isStart +
", mImageUrl='" + mImageUrl + '\'' +
", mLink='" + mLink + '\'' +
", show_type='" + show_type + '\'' +
", mIntoUrl='" + mIntoUrl + '\'' +
", type=" + type +
", model=" + model +
'}';
}
}

59
common/src/main/java/com/yunbao/common/bean/LiveRoomActivityBanner.java Normal file
View File

@@ -0,0 +1,59 @@
package com.yunbao.common.bean;
import com.google.gson.annotations.SerializedName;
/**
* 【新人特惠】【趣味游戏】【幸运天使】
*/
public class LiveRoomActivityBanner extends BaseModel{
@SerializedName("name")
private String name;
@SerializedName("img")
private String img;
@SerializedName("link")
private String link;
@SerializedName("is_hidden")
private int hidden;
@SerializedName("show_type")
private String type;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getImg() {
return img;
}
public void setImg(String img) {
this.img = img;
}
public String getLink() {
return link;
}
public void setLink(String link) {
this.link = link;
}
public int getHidden() {
return hidden;
}
public void setHidden(int hidden) {
this.hidden = hidden;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
}

7
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@@ -8,6 +8,7 @@ import com.yunbao.common.bean.FaceBookUpModel;
import com.yunbao.common.bean.HourRank;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.bean.LiveInfoModel;
import com.yunbao.common.bean.LiveRoomActivityBanner;
import com.yunbao.common.bean.MsgSwitchDetailModel;
import com.yunbao.common.bean.NewPeopleInfo;
import com.yunbao.common.bean.NobleRankHideUserListModel;
@@ -241,4 +242,10 @@ public interface PDLiveApi {
*/
@GET("/api/public/?service=StarChallenge.getStarChallengeStatus")
Observable<ResponseModel<StarChallengeStatusModel>> getStarChallengeStatus(@Query("liveUid") String liveUid);
/**
* 【新人特惠】【趣味游戏】【幸运天使】
*/
@GET("/api/public/?service=Live.getLiveRoomActivtyBanner")
Observable<ResponseModel<List<LiveRoomActivityBanner>>> getLiveRoomActivityBanner();
}

20
common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
View File

@@ -7,6 +7,7 @@ import com.yunbao.common.R;
import com.yunbao.common.bean.ActiveModel;
import com.yunbao.common.bean.BaseModel;
import com.yunbao.common.bean.LiveInfoModel;
import com.yunbao.common.bean.LiveRoomActivityBanner;
import com.yunbao.common.bean.NobleRankHideUserListModel;
import com.yunbao.common.bean.NobleTrumpetModel;
import com.yunbao.common.bean.SetAttentsModel;
@@ -233,4 +234,23 @@ public class LiveNetManager {
callback.onError(throwable.getMessage());
}).isDisposed();
}
/**
* 获取 【新人特惠】【趣味游戏】【幸运天使】
*
*/
public void getLiveRoomActivityBanner(HttpCallback<List<LiveRoomActivityBanner>> callback) {
API.get().pdLiveApi(mContext)
.getLiveRoomActivityBanner()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(listResponseModel -> {
callback.onSuccess(listResponseModel.getData().getInfo());
}, throwable -> {
if (callback != null) {
callback.onError(throwable.getMessage());
}
throwable.printStackTrace();
}).isDisposed();
}
}

68
common/src/main/res/layout/view_live_total.xml
View File

@@ -67,74 +67,6 @@
</LinearLayout>
<LinearLayout
android:id="@+id/fan_club"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="28dp"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_fans" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/fan_club"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/guard_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="28dp"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_guard" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/guard_guard"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/noble_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="28dp"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/live_more_icon_aristocrat" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/noble"
android:textColor="#FF9A9A9A"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/live_wks_layout"
android:layout_width="wrap_content"

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

@@ -103,7 +103,7 @@
<string name="fans">粉絲</string>
<string name="no_mic_opn">Opps… 主播沒有開啟語音連麥</string>
<string name="fanss">粉絲</string>
<string name="noble">貴族</string>
<string name="noble">貴族爵位</string>
<string name="free">免費贈送</string>
<string name="fans_my_fans">我的粉絲</string>
@@ -121,7 +121,7 @@
<string name="guard_my">我的</string>
<string name="diamond">鑽石</string>
<string name="guard_guard">守護</string>
<string name="guard_guard">主播守护</string>
<string name="guard_week_con">本周貢獻</string>
<string name="guard_no_data">主播正在等待您的守護！</string>
<string name="guard_tip_0">快去為喜歡的主播開通守護吧</string>