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

update

Browse Source
This commit is contained in:
zlzw 2023-10-25 22:37:10 +08:00
parent 56dff48462
commit aa6c06927b
13 changed files with 107 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OneToOne/src/main/AndroidManifest.xml
View File

@ -86,7 +86,6 @@
<application
android:name=".AppContext"
android:allowBackup="true"
android:enableOnBackInvokedCallback="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:largeHeap="true"

6
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/RecommendFragment.java
View File

@ -14,21 +14,15 @@ import com.shayu.onetoone.activity.fragments.BaseFragment;
import com.shayu.onetoone.activity.message.ChatActivity;
import com.shayu.onetoone.adapter.HomeRecommendListAdapter;
import com.shayu.onetoone.bean.HomeItemBean;
import com.shayu.onetoone.bean.MatchingItemSizeBean;
import com.shayu.onetoone.bean.SendConsumeBean;
import com.shayu.onetoone.dialog.FirstTipsDialog;
import com.shayu.onetoone.event.HomeBusEvent;
import com.shayu.onetoone.event.MessageMsgBusEvent;
import com.shayu.onetoone.listener.OnSendMessageListener;
import com.shayu.onetoone.manager.OTONetManager;
import com.shayu.onetoone.manager.RouteManager;
import com.shayu.onetoone.manager.SendMessageManager;
import com.yanzhenjie.recyclerview.SwipeRecyclerView;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;

8
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
View File

@ -36,6 +36,7 @@ import com.shayu.onetoone.dialog.BottomListDialog;
import com.shayu.onetoone.dialog.MsgChatClickDialog;
import com.shayu.onetoone.dialog.TipsDialog;
import com.shayu.onetoone.event.MessageMsgBusEvent;
import com.shayu.onetoone.event.MoneyUpdateEvent;
import com.shayu.onetoone.listener.OnDialogClickListener;
import com.shayu.onetoone.listener.OnSendMessageListener;
import com.shayu.onetoone.manager.CallClientManager;
@ -746,6 +747,13 @@ public class ChatMessageFragment extends AbsConversationFragment {
});
}
@Subscribe
public void moneyEvent(MoneyUpdateEvent event) {
if (giftPanel != null) {
giftPanel.updateMoney(event.getMoney());
}
}
@Subscribe
public void event(MessageMsgBusEvent event) {
if (event.getType() == MessageMsgBusEvent.TYPE_UPDATE_SYSTEM) {

42
OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java
View File

@ -1,5 +1,6 @@
package com.shayu.onetoone.activity.message;
import android.annotation.SuppressLint;
import android.app.Dialog;
import android.graphics.Color;
import android.os.Bundle;
@ -161,28 +162,45 @@ public class CallVideoActivity extends AbsOTOActivity {
buttonView = LayoutInflater.from(mContext).inflate(R.layout.view_call_video_item, rootView, false);
callWaitLayout = LayoutInflater.from(mContext).inflate(R.layout.view_call_video_wait, rootView, false);
targetView = buttonView.findViewById(R.id.target_view);
targetView.setTag(true);
targetView.setBackgroundColor(Color.YELLOW);
targetView.setOnClickListener(v -> {
ToastUtil.show("点击");
targetView.setOnClickListener(new VideoViewClick());
}
private boolean isSwitchView = false;
private class VideoViewClick implements View.OnClickListener {
@Override
public void onClick(View view) {
myView.removeAllViews();
targetView.removeAllViews();
if (targetView.getTag() == null) {
myView.addView(remoteVideo);
myView.addView(buttonView);
if (isSwitchView) {
targetView.addView(localVideo);
targetView.setTag(true);
localVideo.setZOrderOnTop(true);
localVideo.setZOrderMediaOverlay(true);
myView.addView(remoteVideo);
remoteVideo.setZOrderOnTop(false);
remoteVideo.setZOrderMediaOverlay(false);
myView.addView(buttonView);
isSwitchView = false;
localVideo.setOnClickListener(new VideoViewClick());
remoteVideo.setOnClickListener(null);
} else {
ImageView imageView=new ImageView(mContext);
ImageView imageView = new ImageView(mContext);
imageView.setImageResource(R.mipmap.bg_message_msg_title_heartbeat);
myView.addView(localVideo);
localVideo.setZOrderOnTop(false);
localVideo.setZOrderMediaOverlay(false);
myView.addView(buttonView);
targetView.addView(imageView);
targetView.setTag(null);
targetView.addView(remoteVideo);
remoteVideo.setZOrderOnTop(true);
remoteVideo.setZOrderMediaOverlay(true);
isSwitchView = true;
remoteVideo.setOnClickListener(new VideoViewClick());
localVideo.setOnClickListener(null);
}
});
}
}
private void initWaitView() {

4
OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerInletActivity.java
View File

@ -87,7 +87,7 @@ public class AuthBloggerInletActivity extends AbsActivity {
findViewById(R.id.personBt).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
RouteManager.forwaradAuthActivity();
RouteManager.forwardAuthActivity();
}
});
} else {
@ -98,7 +98,7 @@ public class AuthBloggerInletActivity extends AbsActivity {
findViewById(R.id.personBt).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
RouteManager.forwaradAuthActivity();
RouteManager.forwardAuthActivity();
}
});
}

5
OneToOne/src/main/java/com/shayu/onetoone/activity/user/EditProfileActivity.java
View File

@ -6,7 +6,6 @@ import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
@ -121,7 +120,7 @@ public class EditProfileActivity extends AbsActivity {
findViewById(R.id.btn_person).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
RouteManager.forwaradAuthActivity();
RouteManager.forwardAuthActivity();
}
});
/*if (mUserBean != null) {
@ -331,7 +330,7 @@ public class EditProfileActivity extends AbsActivity {
.putExtra("isBind", isBind)
.putExtra("mobile", mobile));*/
} else if (i == R.id.auth) {
RouteManager.forwaradAuthActivity();
RouteManager.forwardAuthActivity();
}
}

22
OneToOne/src/main/java/com/shayu/onetoone/event/MoneyUpdateEvent.java Normal file
View File

@ -0,0 +1,22 @@
package com.shayu.onetoone.event;
public class MoneyUpdateEvent extends AbsBusEvent{
public static final int TYPE_UPDATE=0;
private String money;
public MoneyUpdateEvent(int type) {
super(type);
}
public MoneyUpdateEvent(int type, String money) {
super(type);
this.money = money;
}
public String getMoney() {
return money;
}
public void setMoney(String money) {
this.money = money;
}
}

4
OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java
View File

@ -299,7 +299,9 @@ public class CallClientManager {
handler.post(() -> {
for (OnCallStatusListener listener : listeners) {
listener.onTime(extra);
listener.onTimeWarning(warningTime--);
if (warningTime <= 60) {
listener.onTimeWarning(warningTime--);
}
}
});

2
OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java
View File

@ -61,7 +61,7 @@ public class RouteManager {
/**
* 真人认证
*/
public static void forwaradAuthActivity() {
public static void forwardAuthActivity() {
ARouter.getInstance().build(ACTIVITY_AUTH).navigation();
}

22
OneToOne/src/main/java/com/shayu/onetoone/manager/SendMessageManager.java
View File

@ -1,9 +1,13 @@
package com.shayu.onetoone.manager;
import com.shayu.onetoone.bean.MessageConsumeConfigBean;
import com.shayu.onetoone.bean.PurseBean;
import com.shayu.onetoone.bean.SendConsumeBean;
import com.shayu.onetoone.event.MoneyUpdateEvent;
import com.shayu.onetoone.listener.OnSendMessageListener;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ToastUtil;
import java.util.HashMap;
@ -181,6 +185,7 @@ public class SendMessageManager {
listener.onSuccess(null, sd);
}
}
iniPurse(null);
}
@ -200,6 +205,23 @@ public class SendMessageManager {
}
}
}
public static void iniPurse(OnItemClickListener<PurseBean> listener){
OTONetManager.getInstance(null)
.getPurseInfo(new HttpCallback<PurseBean>() {
@Override
public void onSuccess(PurseBean data) {
Bus.get().post(new MoneyUpdateEvent(MoneyUpdateEvent.TYPE_UPDATE,data.getStart()+""));
if(listener!=null){
listener.onItemClick(data,0);
}
}
@Override
public void onError(String error) {
}
});
}
public static void cancel(String token) {
cache.remove(token);

2
OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java
View File

@ -355,8 +355,6 @@ public interface OneToOneApi {
@GET("/api/public/?service=Friendappuser.peopleNum")
Observable<ResponseModel<PeopleNum>> getPeopleNum();
Observable<ResponseModel<List<HomeItemBean>>> getFriends(@Query("p") String p);
/**
* 获取我的菜单

3
OneToOne/src/main/java/com/shayu/onetoone/provider/MessageChatAutoItemProvider.java
View File

@ -8,6 +8,7 @@ import android.widget.Button;
import com.shayu.onetoone.R;
import com.shayu.onetoone.bean.MessageChatAuthContent;
import com.shayu.onetoone.manager.RouteManager;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
@ -62,7 +63,7 @@ public class MessageChatAutoItemProvider extends BaseMessageItemProvider<Message
holder.setOnClickListener(R.id.btn, new View.OnClickListener() {
@Override
public void onClick(View v) {
ToastUtil.show("跳实名认证页面");
RouteManager.forwardAuthActivity();
}
});

31
OneToOne/src/main/java/com/shayu/onetoone/view/MsgInputPanelForGift.java
View File

@ -15,6 +15,7 @@ import com.shayu.onetoone.bean.MessageChatGiftContent;
import com.shayu.onetoone.bean.PurseBean;
import com.shayu.onetoone.bean.SendConsumeBean;
import com.shayu.onetoone.dialog.TipsDialog;
import com.shayu.onetoone.event.MoneyUpdateEvent;
import com.shayu.onetoone.listener.OnSendMessageListener;
import com.shayu.onetoone.manager.OTONetManager;
import com.shayu.onetoone.manager.SendMessageManager;
@ -27,6 +28,8 @@ import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
@ -59,6 +62,10 @@ public class MsgInputPanelForGift extends AbsInputPanel {
this.onItemClickListener = onItemClickListener;
}
public void updateMoney(String moneyNum) {
money.setText(moneyNum);
}
@Override
public void init(View viewGroup) {
gifList = viewGroup.findViewById(R.id.gift_list);
@ -79,7 +86,7 @@ public class MsgInputPanelForGift extends AbsInputPanel {
SendMessageManager.sendMessageForGift(targetId, item.getId() + "", new OnSendMessageListener() {
@Override
public void onSuccess(String token, SendConsumeBean bean) {
super.onSuccess(token,bean);
super.onSuccess(token, bean);
MsgInputPanelForGift.this.token = token;
sendGift(item);
@ -112,9 +119,8 @@ public class MsgInputPanelForGift extends AbsInputPanel {
@Override
public void onSuccess(Message message) {
if (onItemClickListener != null) {
onItemClickListener.onItemClick(item,1);
onItemClickListener.onItemClick(item, 1);
}
iniPurse();
SendMessageManager.onCallSuccess(token, new OnSendMessageListener() {
@Override
public void onError(int status, String msg) {
@ -134,7 +140,6 @@ public class MsgInputPanelForGift extends AbsInputPanel {
}
private void initData() {
iniPurse();
OTONetManager.getInstance(mContext)
.getGiftList(new HttpCallback<List<GiftBean>>() {
@Override
@ -147,19 +152,13 @@ public class MsgInputPanelForGift extends AbsInputPanel {
}
});
SendMessageManager.iniPurse(new OnItemClickListener<PurseBean>() {
@Override
public void onItemClick(PurseBean bean, int position) {
money.setText(bean.getStart());
}
});
}
private void iniPurse(){
OTONetManager.getInstance(mContext)
.getPurseInfo(new HttpCallback<PurseBean>() {
@Override
public void onSuccess(PurseBean data) {
money.setText(data.getStart() + "");
}
@Override
public void onError(String error) {
}
});
}
}