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
Download Patch File Download Diff File Expand all files Collapse all files

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();
}
}