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

直播间UI调整

Browse Source
This commit is contained in:
18401019693 2022-10-26 10:39:54 +08:00
parent 2eba951ad1
commit 0b601738f7
7 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.gradle
View File

@ -10,9 +10,9 @@ ext {
manifestPlaceholders = [
//正式
serverHost : "https://napi.yaoulive.com",
// serverHost : "https://napi.yaoulive.com",
//測試
// serverHost : "https://ceshi.yaoulive.com",
serverHost : "https://ceshi.yaoulive.com",
//腾讯地图
txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
@ -27,6 +27,6 @@ ext {
// true表示谷歌支付 false
isGooglePlay : false,
//是否上报异常日志
isUploadLog : true
isUploadLog : false
]
}

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

@ -145,10 +145,10 @@ public class UserMoreInfoAdapter extends RefreshAdapter<UserBean> {
title.setVisibility(View.GONE);
title1.setVisibility(View.GONE);
Log.i("tag", "" + num);
if (position == 0 && type.equals("1")) {
title1.setText(R.string.noble);
title1.setVisibility(View.VISIBLE);
}
// if (position == 0 && type.equals("1")) {
// title1.setText(R.string.noble);
// title1.setVisibility(View.VISIBLE);
// }
if (position == num && type.equals("1")) {
title.setText(R.string.live_audience);
title.setVisibility(View.VISIBLE);

13
live/src/main/java/com/yunbao/live/dialog/LiveUserMoreDialogFragment.java
View File

@ -3,6 +3,7 @@ package com.yunbao.live.dialog;
import android.app.ActionBar;
import android.graphics.Color;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.Gravity;
import android.view.View;
@ -112,7 +113,8 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
stream = bundle.getString(Constants.STREAM);
isOnly = bundle.getBoolean("only", false);
String outRankHideString = bundle.getString("outRankHide");
outRankHide = GsonUtils.fromJson(outRankHideString, new TypeToken<List<String>>(){}.getType());
outRankHide = GsonUtils.fromJson(outRankHideString, new TypeToken<List<String>>() {
}.getType());
if (userMoreInfoAdapter != null) {
userMoreInfoAdapter.setHide(outRankHide);
@ -264,9 +266,12 @@ public class LiveUserMoreDialogFragment extends AbsDialogFragment implements Vie
}
private List<LiveUserGiftBean> processUserData(JSONObject json) {
List<LiveUserGiftBean> data = JSON.parseArray(json.getString("userlist"), LiveUserGiftBean.class);
if (data == null) {
return new ArrayList<>();
List<LiveUserGiftBean> userGiftBeans = JSON.parseArray(json.getString("userlist"), LiveUserGiftBean.class);
List<LiveUserGiftBean> data = new ArrayList<>();
for (LiveUserGiftBean model : userGiftBeans) {
if (TextUtils.equals(model.getNoble_id(), "0")) {
data.add(model);
}
}
Log.i("tag222", "ssss");
if (data.size() > 0 && pg == 1) {

2
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -1905,7 +1905,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} else if (i == R.id.btn_prize_pool_level) {
((LiveActivity) mContext).openPrizePoolWindow();
} else if (i == R.id.user_more) {
((LiveActivity) mContext).openUserMoreListWindow(4, false);
((LiveActivity) mContext).openUserMoreListWindow(1, false);
} else if (i == R.id.hot_btn) {
((LiveActivity) mContext).openUserMoreListWindow(1, false);

BIN
live/src/main/res/mipmap-mdpi/img_guardian_empty.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 27 KiB

7
main/src/main/java/com/yunbao/main/activity/SettingActivity.java
View File

@ -10,6 +10,7 @@ import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
@ -25,6 +26,7 @@ import com.yunbao.common.Constants;
import com.yunbao.common.activity.AbsActivity;
import com.yunbao.common.activity.WebViewActivity;
import com.yunbao.common.bean.ConfigBean;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.CommonHttpConsts;
import com.yunbao.common.http.CommonHttpUtil;
@ -64,7 +66,7 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
private SettingAdapter mAdapter;
private ImageView studioGiftEffects, studioRideEffects, upSlideSettings, appWindow, systemWindow;
private boolean giftEffect, mountEffect, slide, isFloat;
private TextView systemHit;
private TextView systemHit, reward;
@Override
protected int getLayoutId() {
@ -79,10 +81,13 @@ public class SettingActivity extends AbsActivity implements OnItemClickListener<
studioRideEffects = findViewById(R.id.studio_ride_effects);
upSlideSettings = findViewById(R.id.up_slide_settings);
appWindow = findViewById(R.id.app_window);
reward = findViewById(R.id.reward);
systemHit = findViewById(R.id.system_hit);
systemWindow = findViewById(R.id.system_window);
mRecyclerView.setHasFixedSize(true);
mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
IMLoginModel model = IMLoginManager.get(mContext).getUserInfo();
reward.setVisibility(model.getIsBind() == 1 ? View.GONE : View.VISIBLE);
giftEffect = IMLoginManager.get(mContext).isGiftEffect();
mountEffect = IMLoginManager.get(mContext).isMountEffect();
MainHttpUtil.getSettingList(new HttpCallback() {

1
main/src/main/res/layout/activity_setting.xml
View File

@ -40,6 +40,7 @@
android:textSize="16sp" />
<TextView
android:id="@+id/reward"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="13dp"