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

送礼交互优化

Browse Source
This commit is contained in:
18401019693 2023-06-15 15:27:46 +08:00
parent 8e07d4523f
commit 1198a8f1d8
9 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/res/values-en-rUS/string.xml
View File

@ -1193,4 +1193,5 @@ Limited ride And limited avatar frame</string>
<string name="extract_to">%s is extracted from %s</string>
<string name="extract_to2">%S sent to %s</string>
<string name="rebot_config_auto_say_max">Over the maximum value</string>
<string name="insufficient_balance">Insufficient balance, continue to recharge</string>
</resources>

1
common/src/main/res/values-zh-rHK/strings.xml
View File

@ -1188,4 +1188,5 @@
<string name="extract_to">%s在%s中抽取到了</string>
<string name="extract_to2">%S送给了%s</string>
<string name="rebot_config_auto_say_max">超过最大值</string>
<string name="insufficient_balance">餘額不足，繼續充值</string>
</resources>

1
common/src/main/res/values-zh-rTW/strings.xml
View File

@ -1187,4 +1187,5 @@
<string name="extract_to">%s在%s中抽取到了</string>
<string name="extract_to2">%S送给了%s</string>
<string name="rebot_config_auto_say_max">超过最大值</string>
<string name="insufficient_balance">餘額不足，繼續充值</string>
</resources>

1
common/src/main/res/values-zh/strings.xml
View File

@ -1188,4 +1188,5 @@
<string name="extract_to">%s在%s中抽取到了</string>
<string name="extract_to2">%S送给了%s</string>
<string name="rebot_config_auto_say_max">超过最大值</string>
<string name="insufficient_balance">餘額不足，繼續充值</string>
</resources>

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

@ -1194,4 +1194,5 @@ Limited ride And limited avatar frame</string>
<string name="extract_to2">%S sent to %s</string>
<string name="live_vote_create_error">Create Vote Error</string>
<string name="rebot_config_auto_say_max">Over the maximum value</string>
<string name="insufficient_balance">Insufficient balance, continue to recharge</string>
</resources>

4
config.gradle
View File

@ -9,9 +9,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",

16
live/src/main/java/com/yunbao/live/dialog/LiveGiftDialogFragment.java
View File

@ -4,6 +4,7 @@ import static com.yunbao.common.CommonAppConfig.isGetNewWrap;
import static com.yunbao.common.utils.RouteUtil.PATH_COIN;
import static com.yunbao.live.views.LiveRoomViewHolder.bean1;
import android.app.Dialog;
import android.content.DialogInterface;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
@ -155,6 +156,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
DialogInterface.OnShowListener onShowListener;
private SVGAImageView blindSvga, blindBoxOpen;
private View close_view;
@Override
protected int getLayoutId() {
return R.layout.dialog_live_gift_wrap;
@ -1038,7 +1040,7 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
if (mLiveGiftBean.getType() == LiveGiftBean2.TYPE_NORMAL && !mLiveGiftBean.getSwf().contains("svga")) {
showLianBtn();
}
if (mLiveGiftBean.getType()==7){
if (mLiveGiftBean.getType() == 7) {
showLianBtn();
}
//刷新包裹列表wrap_gift_num -1:表示数量没有变化
@ -1085,6 +1087,18 @@ public class LiveGiftDialogFragment extends AbsDialogFragment implements View.On
AppManager.runDebugCode(() -> {
Log.i("gifBean", mLiveGiftBean.toString());
});
} else if (code == 1001) {
hideLianBtn();
new DialogUitl.Builder(mContext)
.setView(R.layout.dialog_live_unfollow)
.setConfirmString(getString(R.string.charge))
.setContent(getString(R.string.insufficient_balance))
.setClickCallback(new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
forwardMyCoin(0);
}
}).build().show();
} else {
hideLianBtn();
ToastUtil.show(msg);

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

@ -2633,17 +2633,21 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
getIsHot();
getGuardInfo();
}
}
private void getGuardInfo() {
LiveHttpUtil.getUserList(mLiveUid, mStream, "guard", 1, new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
JSONObject json = JSONObject.parseObject(info[0]);
JSONArray userlist = json.getJSONArray("userlist");
if (userlist.size() != 0) {
setGuardIcon(JSONArray.parseArray(userlist.toJSONString(), LiveUserGiftBean.class).get(0));
if (code == 0) {
JSONObject json = JSONObject.parseObject(info[0]);
JSONArray userlist = json.getJSONArray("userlist");
if (userlist.size() != 0) {
setGuardIcon(JSONArray.parseArray(userlist.toJSONString(), LiveUserGiftBean.class).get(0));
}
}
}
});
}

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

@ -41,7 +41,7 @@
android:layout_marginEnd="6dp"
android:text="@string/come_hint"
android:textColor="#fff"
android:textSize="10sp" />
android:textSize="12sp" />
</LinearLayout>