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

token问题，喇叭

Browse Source
This commit is contained in:
18401019693
2022-08-02 10:27:46 +08:00
parent ab3141f5f5
commit e5cf353597
12 changed files with 223 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -869,6 +869,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
Bundle bundle = new Bundle();
bundle.putString(Constants.LIVE_DANMU_PRICE, mDanmuPrice);
bundle.putString(Constants.COIN_NAME, mCoinName);
bundle.putString(Constants.LIVE_UID, mLiveUid);
fragment.setArguments(bundle);
fragment.show(getSupportFragmentManager(), "LiveInputDialogFragment");
}

32
live/src/main/java/com/yunbao/live/dialog/LiveInputDialogFragment.java
View File

@@ -26,6 +26,7 @@ import android.widget.TextView;
import androidx.fragment.app.FragmentActivity;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.BaseModel;
import com.yunbao.common.bean.NobleTrumpetModel;
import com.yunbao.common.custom.MyRadioButton;
import com.yunbao.common.dialog.AbsDialogFragment;
@@ -36,7 +37,6 @@ import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.live.R;
import com.yunbao.live.activity.LiveActivity;
import com.yunbao.live.http.LiveHttpUtil;
import java.util.ArrayList;
import java.util.List;
@@ -66,6 +66,7 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
private long nobleId;//贵族等级
private long trumpetNum;//喇叭数量
private String mLiveUid;//主播ID
@Override
@@ -154,6 +155,7 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
}
String danmuPrice = bundle.getString(Constants.LIVE_DANMU_PRICE);
String coinName = bundle.getString(Constants.COIN_NAME);
mLiveUid = bundle.getString(Constants.LIVE_UID);
mHint1 = WordUtil.getString(R.string.live_open_alba) + danmuPrice + coinName + "/" + WordUtil.getString(R.string.live_tiao);
mHint2 = WordUtil.getString(R.string.live_say_something);
mCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -187,8 +189,19 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
switch (messageType) {
case WORLDHORN:
trumpetMsg = content;
netHandler.post(nobleUseTrumpetRunnable);
dismiss();
LiveNetManager.get(getContext())
.nobleUseTrumpet(trumpetMsg, mLiveUid, new HttpCallback<List<BaseModel>>() {
@Override
public void onSuccess(List<BaseModel> data) {
dismiss();
ToastUtil.show(getResources().getString(R.string.use_successfully));
}
@Override
public void onError(String error) {
ToastUtil.show(error);
}
});
break;
case POPUPSCREEN:
((LiveActivity) mContext).sendDanmuMessage(content);
@@ -221,7 +234,7 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
public void onCheckedChanged(RadioGroup group, int checkedId) {
changeCheckState(checkedId);
if (checkedId == R.id.btn_2) {
if (nobleId < 5) {
if (nobleId < 5 || trumpetNum < 1) {
imm.hideSoftInputFromWindow(mInput.getWindowToken(), 0);
HighNobilityDialog fragment = new HighNobilityDialog();
fragment.show(((FragmentActivity) mContext).getSupportFragmentManager(), "HighNobilityDialog");
@@ -319,16 +332,5 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
});
}
};
//发送全局喇叭
private Runnable nobleUseTrumpetRunnable = new Runnable() {
@Override
public void run() {
LiveHttpUtil.nobleUseTrumpet(trumpetMsg, new com.yunbao.common.http.HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
}
});
}
};
}

5
live/src/main/java/com/yunbao/live/http/LiveHttpUtil.java
View File

@@ -889,9 +889,10 @@ public class LiveHttpUtil {
/**
* 获取用户贵族喇叭的数量
*/
public static void nobleUseTrumpet(String trumpet_msg,HttpCallback callback) {
public static void nobleUseTrumpet(String trumpet_msg,String anchor_id,HttpCallback callback) {
HttpClient.getInstance().get("Noble.nobleUseTrumpet", "nobleUseTrumpet")
.params("trumpet_msg", trumpet_msg)
.params("", trumpet_msg)
.params("", anchor_id)
.execute(callback);
}
}

11
live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
View File

@@ -9,10 +9,12 @@ import android.widget.LinearLayout;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.blankj.utilcode.util.GsonUtils;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
import com.yunbao.common.bean.FansMedalBean;
import com.yunbao.common.bean.SocketModel;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient;
@@ -130,7 +132,7 @@ public class SocketRyClient {
mListener.onSuperCloseLive();//超管关闭房间
return;
}
if(socketMsg.contains("LivePK_UnreadCount")){
if (socketMsg.contains("LivePK_UnreadCount")) {
return;
}
SocketReceiveBean received = JSON.parseObject(socketMsg, SocketReceiveBean.class);
@@ -167,7 +169,7 @@ public class SocketRyClient {
// LiveLinkMicPresenter.setHD(map.getString("ct"));
break;
case Constants.SOCKET_SYSTEM://系统消息
if(map.getString("ct").contains("甜蜜不停")){
if (map.getString("ct").contains("甜蜜不停")) {
break;
}
UserBean us = CommonAppConfig.getInstance().getUserBean();
@@ -437,6 +439,11 @@ public class SocketRyClient {
chatBean3.setHot_num(jsonObject3.getString("gift_name"));
mListener.onChat(chatBean3, 1);
break;
case Constants.TRUMPET_NOTIFY://全站喇叭
SocketModel model = GsonUtils.fromJson(socketMsg, SocketModel.class);
Log.e(Constants.TRUMPET_NOTIFY,model.getMsg().get(0).getTrumpetMsg());
Log.e(Constants.TRUMPET_NOTIFY,model.getMsg().get(0).getUserName());
break;
}
}