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

修复测试反馈问题

Browse Source
This commit is contained in:
zlzw
2023-10-27 17:53:28 +08:00
parent 4bd1e8eccc
commit 9d0f8cb060
43 changed files with 441 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ import com.shayu.onetoone.provider.MessageChatAutoItemProvider;
import com.shayu.onetoone.provider.MessageChatReceiveGiftItemProvider;
import com.shayu.onetoone.provider.MessageChatTipsItemProvider;
import com.shayu.onetoone.provider.OTOCallEndMessageItemProvider;
import com.shayu.onetoone.utils.ChatPluginExtensionConfig;
import com.shayu.onetoone.utils.NeverCrashUtils;
import com.yunbao.common.BuildConfig;
import com.yunbao.common.CommonAppContext;
@@ -38,6 +39,8 @@ import java.util.ArrayList;
import io.rong.callkit.CallEndMessageItemProvider;
import io.rong.imkit.RongIM;
import io.rong.imkit.config.RongConfigCenter;
import io.rong.imkit.conversation.extension.RongExtension;
import io.rong.imkit.conversation.extension.RongExtensionManager;
import io.rong.imkit.conversationlist.model.BaseUiConversation;
import io.rong.imkit.conversationlist.provider.PrivateConversationProvider;
import io.rong.imkit.utils.RouteUtils;
@@ -124,6 +127,7 @@ public class AppContext extends CommonAppContext {
RongConfigCenter.conversationConfig().replaceMessageProvider(CallEndMessageItemProvider.class,new OTOCallEndMessageItemProvider());
RongExtensionManager.getInstance().setExtensionConfig(new ChatPluginExtensionConfig());
}

58
OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
View File

@@ -1,6 +1,5 @@
package com.shayu.onetoone.activity;
import android.app.Dialog;
import android.os.Bundle;
import android.view.View;
@@ -20,30 +19,23 @@ import com.shayu.onetoone.activity.fragments.DynamicFragment;
import com.shayu.onetoone.activity.fragments.FriendsFragment;
import com.shayu.onetoone.activity.fragments.MessageFragment;
import com.shayu.onetoone.activity.fragments.MyFragment;
import com.shayu.onetoone.activity.fragments.message.MsgMessageFragment;
import com.shayu.onetoone.activity.message.ChatActivity;
import com.shayu.onetoone.bean.JoinAnchorBean;
import com.shayu.onetoone.bean.MatchingItemSizeBean;
import com.shayu.onetoone.bean.OfficialNoticeBean;
import com.shayu.onetoone.bean.SendConsumeBean;
import com.shayu.onetoone.dialog.FirstTipsDialog;
import com.shayu.onetoone.dialog.TipsDialog;
import com.shayu.onetoone.event.HomeBusEvent;
import com.shayu.onetoone.event.MessageMsgBusEvent;
import com.shayu.onetoone.listener.OnDialogClickListener;
import com.shayu.onetoone.listener.OnSendMessageListener;
import com.shayu.onetoone.manager.CallClientManager;
import com.shayu.onetoone.manager.OTONetManager;
import com.shayu.onetoone.manager.RouteManager;
import com.shayu.onetoone.manager.SendMessageManager;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.NoviceInstructorManager;
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import org.greenrobot.eventbus.Subscribe;
@@ -52,12 +44,9 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.List;
import io.rong.imkit.RongIM;
import io.rong.imkit.manager.UnReadMessageManager;
import io.rong.imkit.userinfo.RongUserInfoManager;
import io.rong.imlib.RongIMClient;
import io.rong.imlib.model.Conversation;
import io.rong.imlib.model.UserInfo;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import kotlin.jvm.functions.Function4;
@@ -173,10 +162,10 @@ public class MainActivity extends AbsOTOActivity {
RouteManager.forwardActivity(RouteManager.ACTIVITY_MATCHING);
}
});
OTONetManager.getInstance(mContext).setFiled("is_login","1",null);
OTONetManager.getInstance(mContext).setFiled("is_login", "1", null);
} else {
viewPager.setCurrentItem(2);
OTONetManager.getInstance(mContext).setFiled("is_chat","1",null);
OTONetManager.getInstance(mContext).setFiled("is_chat", "1", null);
}
dialog.dismiss();
}
@@ -197,6 +186,7 @@ public class MainActivity extends AbsOTOActivity {
super.onResume();
checkUserInfoIsSet();
initFirstLoginTips();
ToastUtil.showDebug("2");
}
/**
@@ -219,35 +209,21 @@ public class MainActivity extends AbsOTOActivity {
}
private void showRedPoint(int count) {
OTONetManager.getInstance(mContext).getMessageSystemLists(new HttpCallback<List<OfficialNoticeBean>>() {
int point = 0;
//大于0则是通过会话未读监听器获取到的数，则不用再调用获取未读数接口了
if (count >= 0) {
updateUnreadCount(MsgMessageFragment.systemPoint + count);
Bus.get().post(new MessageMsgBusEvent(MessageMsgBusEvent.TYPE_UPDATE_POINT, MsgMessageFragment.systemPoint + count));
return;
}
RongIMClient.getInstance().getTotalUnreadCount(new RongIMClient.ResultCallback<Integer>() {
@Override
public void onSuccess(List<OfficialNoticeBean> data) {
for (OfficialNoticeBean datum : data) {
point += datum.getNum();
}
Bus.get().post(new MessageMsgBusEvent(MessageMsgBusEvent.TYPE_UPDATE_SYSTEM, point + count));
//大于0则是通过会话未读监听器获取到的数，则不用再调用获取未读数接口了
if (count >= 0) {
updateUnreadCount(point + count);
return;
}
RongIMClient.getInstance().getTotalUnreadCount(new RongIMClient.ResultCallback<Integer>() {
@Override
public void onSuccess(Integer integer) {
updateUnreadCount(point + integer);
}
@Override
public void onError(RongIMClient.ErrorCode e) {
}
});
public void onSuccess(Integer integer) {
updateUnreadCount(MsgMessageFragment.systemPoint + integer);
Bus.get().post(new MessageMsgBusEvent(MessageMsgBusEvent.TYPE_UPDATE_POINT, MsgMessageFragment.systemPoint + integer));
}
@Override
public void onError(String error) {
public void onError(RongIMClient.ErrorCode e) {
}
});
@@ -278,6 +254,10 @@ public class MainActivity extends AbsOTOActivity {
public void busEvent(MessageMsgBusEvent event) {
if (event.getType() == MessageMsgBusEvent.TYPE_ALL_READ) {
updateUnreadCount(0);
} else if (event.getType() == MessageMsgBusEvent.TYPE_UPDATE_POINT) {
if (event.getNum() == -1) {
showRedPoint(-1);
}
}
}
}

1
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/home/HomeRankFragment.java
View File

@@ -190,6 +190,7 @@ public class HomeRankFragment extends BaseFragment {
void setData(HomeRankBean user, int position) {
getItem(position,mItem1,mItem2,mItem3).setVisibility(View.VISIBLE);
getItem(position,diamond1,diamond2,diamond3).setVisibility(View.VISIBLE);
getItem(position, mName1, mName2, mName3).setText(user.getUserNicename());
getItem(position, mVotes1, mVotes2, mVotes3).setText(user.getMoney());
if (user.isFollow()) {

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

@@ -7,6 +7,7 @@ import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
@@ -19,6 +20,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.FileProvider;
import com.lxj.xpopup.XPopup;
import com.makeramen.roundedimageview.RoundedImageView;
@@ -27,9 +29,7 @@ import com.shayu.onetoone.adapter.MsgChatMessageListAdapter;
import com.shayu.onetoone.bean.FollowBean;
import com.shayu.onetoone.bean.GiftBean;
import com.shayu.onetoone.bean.MessageChatAuthContent;
import com.shayu.onetoone.bean.MessageChatTipsContent;
import com.shayu.onetoone.bean.MessageConsumeConfigBean;
import com.shayu.onetoone.bean.OfficialNoticeBean;
import com.shayu.onetoone.bean.SendConsumeBean;
import com.shayu.onetoone.bean.UserBean;
import com.shayu.onetoone.dialog.BottomListDialog;
@@ -53,7 +53,6 @@ import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
@@ -70,6 +69,8 @@ import java.util.List;
import io.rong.imkit.IMCenter;
import io.rong.imkit.config.RongConfigCenter;
import io.rong.imkit.conversation.MessageListAdapter;
import io.rong.imkit.conversation.extension.InputMode;
import io.rong.imkit.conversation.extension.RongExtensionViewModel;
import io.rong.imkit.model.UiMessage;
import io.rong.imkit.picture.PictureSelector;
import io.rong.imkit.picture.config.PictureMimeType;
@@ -89,7 +90,7 @@ public class ChatMessageFragment extends AbsConversationFragment {
View mInputPanel;
View numLayout;
EditText mEditText;
ImageView img, call, video, gift;
ImageView img, call, video, gift,mEmojiToggleBtn;
ProcessImageUtil cameraUtil;
String targetId;
Conversation.ConversationType conversationType = Conversation.ConversationType.PRIVATE;
@@ -103,6 +104,7 @@ public class ChatMessageFragment extends AbsConversationFragment {
ImageView status;
TextView num;
Button follow;
RongExtensionViewModel mExtensionViewModel;
private String token;
@@ -126,7 +128,7 @@ public class ChatMessageFragment extends AbsConversationFragment {
initBtn();
initChat();
initPriceBean();
cameraUtil = new ProcessImageUtil(getActivity(), "com.shayu.onetoone.fileprovider");
cameraUtil = new ProcessImageUtil(getActivity(), "${packageName}.fileprovider");
mRongExtension.setVisibility(View.VISIBLE);
// img.setOnClickListener(v -> cameraUtil.getImageByCamera());
@@ -202,19 +204,25 @@ public class ChatMessageFragment extends AbsConversationFragment {
MsgInputPanelForAudio audio;
MsgInputPanelForGift giftPanel;
/**
* 反射拿融云的view
*/
private void initBtn() {
try {
Field field = mRongExtension.getInputPanel().getClass().getDeclaredField("mInputPanel");
field.setAccessible(true);
mInputPanel = (View) field.get(mRongExtension.getInputPanel());
assert mInputPanel != null;
field=mRongExtension.getInputPanel().getClass().getDeclaredField("mExtensionViewModel");
field.setAccessible(true);
mExtensionViewModel= (RongExtensionViewModel) field.get(mRongExtension.getInputPanel());
mSendBtn = mInputPanel.getRootView().findViewById(R.id.send_btn);
img = mInputPanel.getRootView().findViewById(R.id.input_panel_image_btn);
video = mInputPanel.getRootView().findViewById(R.id.input_panel_video_btn);
call = mInputPanel.getRootView().findViewById(R.id.input_panel_call_btn);
gift = mInputPanel.getRootView().findViewById(R.id.input_panel_gift_btn);
mEditText = mInputPanel.getRootView().findViewById(R.id.edit_btn);
mEmojiToggleBtn = mInputPanel.findViewById(R.id.input_panel_emoji_btn);
ImageView mVoiceToggleBtn = (ImageView) mInputPanel.getRootView().findViewById(R.id.input_panel_voice_toggle);
assert mVoiceToggleBtn != null;
audio = new MsgInputPanelForAudio(targetId, getActivity(), mRongExtension);
@@ -230,12 +238,25 @@ public class ChatMessageFragment extends AbsConversationFragment {
}
});
mVoiceToggleBtn.setOnClickListener(view -> {
mExtensionViewModel.getInputModeLiveData().setValue(InputMode.TextInput);
giftPanel.hide();
audio.show();
});
gift.setOnClickListener(v -> {
mExtensionViewModel.getInputModeLiveData().setValue(InputMode.TextInput);
audio.hide();
giftPanel.show();
});
mEmojiToggleBtn.setOnClickListener(v -> {
if(mExtensionViewModel.getInputModeLiveData().getValue()==InputMode.TextInput){
audio.hide();
giftPanel.hide();
mExtensionViewModel.getInputModeLiveData().setValue(InputMode.EmoticonMode);
}else{
mExtensionViewModel.getInputModeLiveData().setValue(InputMode.TextInput);
}
});
video.setOnClickListener(v -> {
if (call.getTag() != null) {
@@ -281,7 +302,9 @@ public class ChatMessageFragment extends AbsConversationFragment {
@Override
public void onError(int status, String msg) {
super.onError(status, msg);
sendAuthRequest();
if(status==1) {
sendAuthRequest();
}
}
});
});
@@ -328,7 +351,9 @@ public class ChatMessageFragment extends AbsConversationFragment {
@Override
public void onError(int status, String msg) {
super.onError(status, msg);
sendAuthRequest();
if(status==1) {
sendAuthRequest();
}
}
});
});
@@ -380,10 +405,10 @@ public class ChatMessageFragment extends AbsConversationFragment {
.getTargetUserInfo(Integer.parseInt(targetId), new HttpCallback<UserBean>() {
@Override
public void onSuccess(UserBean data) {
if (data.getInfo().getName_auth() == 1) {
listener.onError(0, "");
} else {
if (data.getInfo().getName_auth() == 2) {
listener.onSuccess("", null);
} else {
listener.onError(data.getInfo().getName_auth(), "");
}
}
@@ -657,7 +682,14 @@ public class ChatMessageFragment extends AbsConversationFragment {
for (LocalMedia item : selectList) {
String mimeType = item.getMimeType();
if (mimeType.startsWith("image")) {
ImageMessage imageMessage = ImageMessage.obtain(Uri.parse(item.getPath()), sendOrigin);
Uri uri;
//判断安卓版本小于10
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
uri= FileProvider.getUriForFile(mContext,mContext.getPackageName()+".fileprovider",new File(item.getPath()));
}else{
uri=Uri.parse(item.getPath());
}
ImageMessage imageMessage = ImageMessage.obtain(uri, sendOrigin);
Message message = Message.obtain(targetId, conversationType, imageMessage);
message.setSenderUserId(CommonAppConfig.getInstance().getUid());
message.setObjectName("RC:ImgMsg");
@@ -714,35 +746,20 @@ public class ChatMessageFragment extends AbsConversationFragment {
}
private void showRedPoint() {
OTONetManager.getInstance(mContext).getMessageSystemLists(new HttpCallback<List<OfficialNoticeBean>>() {
int point = 0;
RongIMClient.getInstance().getTotalUnreadCount(new RongIMClient.ResultCallback<Integer>() {
@Override
public void onSuccess(List<OfficialNoticeBean> data) {
for (OfficialNoticeBean datum : data) {
point += datum.getNum();
public void onSuccess(Integer integer) {
Integer tmp = integer + MsgMessageFragment.systemPoint;
if (tmp <= 0) {
numLayout.setVisibility(View.INVISIBLE);
return;
}
RongIMClient.getInstance().getTotalUnreadCount(new RongIMClient.ResultCallback<Integer>() {
@Override
public void onSuccess(Integer integer) {
Integer tmp = integer + point;
if (tmp <= 0) {
numLayout.setVisibility(View.INVISIBLE);
return;
}
numLayout.setVisibility(View.VISIBLE);
num.setText(tmp + "");
}
@Override
public void onError(RongIMClient.ErrorCode e) {
}
});
numLayout.setVisibility(View.VISIBLE);
num.setText(tmp + "");
}
@Override
public void onError(String error) {
public void onError(RongIMClient.ErrorCode e) {
}
});
@@ -757,7 +774,7 @@ public class ChatMessageFragment extends AbsConversationFragment {
@Subscribe
public void event(MessageMsgBusEvent event) {
if (event.getType() == MessageMsgBusEvent.TYPE_UPDATE_SYSTEM) {
if (event.getType() == MessageMsgBusEvent.TYPE_UPDATE_POINT) {
if (event.getNum() <= 0) {
numLayout.setVisibility(View.INVISIBLE);
return;

7
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MessageInteractiveFragment.java
View File

@@ -48,6 +48,13 @@ public class MessageInteractiveFragment extends AbsConversationFragment {
.getSystemMessageList(noticeBean.getType(), new HttpCallback<List<SystemMessageBean>>() {
@Override
public void onSuccess(List<SystemMessageBean> data) {
if(data.isEmpty()){
mList.setVisibility(View.GONE);
findViewById(R.id.view_empty).setVisibility(View.VISIBLE);
return;
}
mList.setVisibility(View.VISIBLE);
findViewById(R.id.view_empty).setVisibility(View.GONE);
List<UiMessage> list = new ArrayList<>();
for (SystemMessageBean item : data) {
SystemNoticeUiMessage message = new SystemNoticeUiMessage(new Message());

7
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MessageNoticeFragment.java
View File

@@ -46,6 +46,13 @@ public class MessageNoticeFragment extends AbsConversationFragment {
.getSystemMessageList(noticeBean.getType(), new HttpCallback<List<SystemMessageBean>>() {
@Override
public void onSuccess(List<SystemMessageBean> data) {
if(data.isEmpty()){
mList.setVisibility(View.GONE);
findViewById(R.id.view_empty).setVisibility(View.VISIBLE);
return;
}
mList.setVisibility(View.VISIBLE);
findViewById(R.id.view_empty).setVisibility(View.GONE);
List<UiMessage> list = new ArrayList<>();
for (SystemMessageBean item : data) {
SystemNoticeUiMessage message = new SystemNoticeUiMessage(new Message());

9
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java
View File

@@ -1,7 +1,6 @@
package com.shayu.onetoone.activity.fragments.message;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
import android.text.SpannableString;
import android.view.LayoutInflater;
@@ -12,15 +11,12 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.fastjson.JSONObject;
import com.shayu.onetoone.R;
import com.shayu.onetoone.activity.fragments.BaseFragment;
import com.shayu.onetoone.adapter.MsgMessageRecyclerViewAdapter;
import com.shayu.onetoone.bean.HomeItemBean;
import com.shayu.onetoone.bean.OfficialNoticeBean;
import com.shayu.onetoone.event.MessageMsgBusEvent;
import com.shayu.onetoone.manager.OTONetManager;
import com.yanzhenjie.recyclerview.OnItemClickListener;
import com.yanzhenjie.recyclerview.OnItemMenuClickListener;
import com.yanzhenjie.recyclerview.OnItemMenuStateListener;
import com.yanzhenjie.recyclerview.SwipeMenuBridge;
@@ -31,7 +27,6 @@ import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.WordUtil;
import org.greenrobot.eventbus.Subscribe;
@@ -55,8 +50,6 @@ import io.rong.imkit.widget.refresh.listener.OnRefreshListener;
import io.rong.imkit.widget.refresh.wrapper.RongRefreshHeader;
import io.rong.imlib.RongIMClient;
import io.rong.imlib.model.Conversation;
import io.rong.imlib.model.Message;
import io.rong.imlib.model.UserInfo;
/**
* 消息-好友
@@ -238,7 +231,7 @@ public class MsgFriendFragment extends BaseFragment implements BaseAdapter.OnIte
@Subscribe
public void event(MessageMsgBusEvent event) {
if (event.getType() == MessageMsgBusEvent.TYPE_UPDATE_SYSTEM) {
if (event.getType() == MessageMsgBusEvent.TYPE_UPDATE_POINT) {
page = 1;
initData();
}

21
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java
View File

@@ -1,7 +1,6 @@
package com.shayu.onetoone.activity.fragments.message;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
@@ -24,19 +23,16 @@ import com.shayu.onetoone.bean.OfficialNoticeBean;
import com.shayu.onetoone.bean.TargetUserInfoBean;
import com.shayu.onetoone.event.MessageMsgBusEvent;
import com.shayu.onetoone.manager.OTONetManager;
import com.shayu.onetoone.manager.RouteManager;
import com.yanzhenjie.recyclerview.OnItemMenuClickListener;
import com.yanzhenjie.recyclerview.OnItemMenuStateListener;
import com.yanzhenjie.recyclerview.SwipeMenuBridge;
import com.yanzhenjie.recyclerview.SwipeMenuCreator;
import com.yanzhenjie.recyclerview.SwipeMenuItem;
import com.yanzhenjie.recyclerview.SwipeRecyclerView;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.RandomUtil;
import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
@@ -90,6 +86,7 @@ import io.rong.imlib.model.UserInfo;
* copy {@link io.rong.imkit.conversationlist.ConversationListFragment}
*/
public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnItemClickListener {
public static int systemPoint = 0;
private static final String TAG = MsgMessageFragment.class.getSimpleName();
SwipeRecyclerView mList;
SmartRefreshLayout mRefreshLayout;
@@ -174,13 +171,13 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
private void initSystemNotice() {
systemPoint = 0;
OTONetManager.getInstance(mContext)
.getMessageSystemLists(new HttpCallback<List<OfficialNoticeBean>>() {
@Override
public void onSuccess(List<OfficialNoticeBean> data) {
for (OfficialNoticeBean datum : data) {
systemPoint += datum.getNum();
if (datum.getType() == 3) {
SpUtil.setStringValue("customerService", JSONObject.toJSONString(datum));
continue;
@@ -196,6 +193,7 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
}
onConversationListRefresh(mRefreshLayout);
mAdapter.notifyDataSetChanged();
Bus.get().post(new MessageMsgBusEvent(MessageMsgBusEvent.TYPE_UPDATE_POINT, -1));
}
@Override
@@ -209,7 +207,7 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
}
private SingleConversation setTopData(String title, String content, long time, String avatar, int num, int id, String exp) {
if(StringUtil.isEmpty(content)){
if (StringUtil.isEmpty(content)) {
content = "";
}
SingleConversation conversation = new SingleConversation(getContext(), new Conversation());
@@ -241,7 +239,9 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
* 全部标记已读
*/
public void allRead() {
// clearTopData();
// clearTopData();
OTONetManager.getInstance(mContext)
.messageReadAll(null);
RongCoreClient.getInstance().getUnreadConversationList(new IRongCoreCallback.ResultCallback<List<Conversation>>() {
@Override
public void onSuccess(List<Conversation> conversations) {
@@ -350,7 +350,9 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
public void onResume() {
super.onResume();
initSystemNotice();
if (this.mConversationListViewModel != null) {
mConversationListViewModel.getConversationList(false, true, 0L);
this.mConversationListViewModel.clearAllNotification();
}
@@ -426,6 +428,7 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
protected void onConversationListRefresh(RefreshLayout refreshLayout) {
if (this.mConversationListViewModel != null) {
Bus.get().post(new MessageMsgBusEvent(MessageMsgBusEvent.TYPE_UPDATE_POINT, -1));
this.mConversationListViewModel.getConversationList(false, true, 0L);
}
}
@@ -489,7 +492,7 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
Bundle bundle = new Bundle();
bundle.putInt("model", noticeBean.getType());
bundle.putString("data", JSONObject.toJSONString(noticeBean));
RouteUtils.routeToConversationActivity(getContext(), conversationIdentifier,bundle);
RouteUtils.routeToConversationActivity(getContext(), conversationIdentifier, bundle);
}
}

7
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/SystemMessageFragment.java
View File

@@ -93,6 +93,13 @@ public class SystemMessageFragment extends AbsConversationFragment {
.getSystemMessageList(SystemMessageBean.TYPE_SYSTEM, new HttpCallback<List<SystemMessageBean>>() {
@Override
public void onSuccess(List<SystemMessageBean> data) {
if(data.isEmpty()){
mList.setVisibility(View.GONE);
findViewById(R.id.view_empty).setVisibility(View.VISIBLE);
return;
}
mList.setVisibility(View.VISIBLE);
findViewById(R.id.view_empty).setVisibility(View.GONE);
for (SystemMessageBean item : data) {
sendMessage(item);
}

2
OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java
View File

@@ -87,7 +87,7 @@ public class CompleteActivity extends AbsOTOActivity {
}
private void initCamera() {
cameraUtil = new ProcessImageUtil(this, "com.shayu.onetoone.fileprovider");
cameraUtil = new ProcessImageUtil(this, "${packageName}.fileprovider");
cameraUtil.setImageResultCallback(new ImageResultCallback() {
@Override
public void beforeCamera() {

26
OneToOne/src/main/java/com/shayu/onetoone/activity/login/LoginActivity.java
View File

@@ -18,51 +18,29 @@ import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.blankj.utilcode.util.DeviceUtils;
import com.blankj.utilcode.util.GsonUtils;
import com.fm.openinstall.OpenInstall;
import com.fm.openinstall.listener.AppInstallAdapter;
import com.fm.openinstall.model.AppData;
import com.lzy.okgo.model.Response;
import com.shayu.onetoone.R;
import com.shayu.onetoone.activity.AbsOTOActivity;
import com.shayu.onetoone.activity.MainActivity;
import com.shayu.onetoone.bean.JoinAnchorBean;
import com.shayu.onetoone.manager.OTONetManager;
import com.shayu.onetoone.manager.RouteManager;
import com.shayu.onetoone.utils.MainHttpUtil;
import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.Constants;
import com.yunbao.common.HtmlConfig;
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.bean.LiveBean;
import com.yunbao.common.bean.UserAreaBean;
import com.yunbao.common.bean.UserBean;
import com.yunbao.common.fragment.LoadingDialog;
import com.yunbao.common.http.CommonHttpConsts;
import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient;
import com.yunbao.common.http.JsonBean;
import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.interfaces.CommonCallback;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.NoviceInstructorManager;
import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
import com.yunbao.common.utils.LiveRoomCheckLivePresenter;
import com.yunbao.common.utils.RouteUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -160,7 +138,7 @@ public class LoginActivity extends AbsOTOActivity {
public void onTextChanged(CharSequence s, int start, int before, int count) {
String phone = mEditPhone.getText().toString();
String pwd = mEditPwd.getText().toString();
mBtnLogin.setEnabled(!TextUtils.isEmpty(phone) && !TextUtils.isEmpty(pwd));
// mBtnLogin.setEnabled(!TextUtils.isEmpty(phone) && !TextUtils.isEmpty(pwd));
}
@Override
@@ -373,6 +351,6 @@ public class LoginActivity extends AbsOTOActivity {
@Override
public void onBackPressed() {
super.onBackPressed();
RouteUtil.forwardEntry2();
RouteManager.forwardEntryActivity();
}
}

4
OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java
View File

@@ -104,6 +104,10 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis
CallClientManager.getManager().removeOnVoIPCallListener(onCallStatusListener);
}
@Override
public void onBackPressed() {
}
private void initView() {
// 获取全局变量
vague = findViewById(R.id.vague);

2
OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthActivity.java
View File

@@ -149,7 +149,7 @@ public class AuthActivity extends AbsActivity {
}
private void initCamera() {
cameraUtil = new ProcessImageUtil(this, "com.shayu.onetoone.fileprovider");
cameraUtil = new ProcessImageUtil(this, "${packageName}.fileprovider");
cameraUtil.setImageResultCallback(new ImageResultCallback() {
@Override
public void beforeCamera() {

2
OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerActivity.java
View File

@@ -172,7 +172,7 @@ public class AuthBloggerActivity extends AbsActivity {
};
private void initCamera() {
cameraUtil = new ProcessImageUtil(this, "com.shayu.onetoone.fileprovider");
cameraUtil = new ProcessImageUtil(this, "${packageName}.fileprovider");
cameraUtil.setImageResultCallback(new ImageResultCallback() {
@Override
public void beforeCamera() {

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

@@ -138,7 +138,7 @@ public class EditProfileActivity extends AbsActivity {
}
private void initCamera() {
cameraUtil = new ProcessImageUtil(this, "com.shayu.onetoone.fileprovider");
cameraUtil = new ProcessImageUtil(this, "${packageName}.fileprovider");
cameraUtil.setImageResultCallback(new ImageResultCallback() {
@Override
public void beforeCamera() {

3
OneToOne/src/main/java/com/shayu/onetoone/bean/OfficialNoticeBean.java
View File

@@ -57,6 +57,9 @@ public class OfficialNoticeBean extends BaseModel {
}
public int getNum() {
if (num < 0) {
num = 0;
}
return num;
}

2
OneToOne/src/main/java/com/shayu/onetoone/bean/UserBean.java
View File

@@ -69,7 +69,7 @@ public class UserBean extends BaseModel {
private int b_y;
private int b_ym;
private int b_ymd;
private int name_auth;
private int name_auth;//1 未提交 2 已认证 3已提交
private long name_auth_time;
private String auth_front;
private String auth_back;

3
OneToOne/src/main/java/com/shayu/onetoone/event/MessageMsgBusEvent.java
View File

@@ -2,7 +2,8 @@ package com.shayu.onetoone.event;
public class MessageMsgBusEvent extends AbsBusEvent {
public static final int TYPE_ALL_READ = 0;
public static final int TYPE_UPDATE_SYSTEM=1;
public static final int TYPE_UPDATE_POINT =1;
public static final int TYPE_UPDATE_SYSTEM =2;
private int num;

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

@@ -85,6 +85,37 @@ public class CallClientManager {
public void addOnVoIPCallListener(OnCallStatusListener statusListener) {
listeners.add(statusListener);
RongCallClient.getInstance().setVoIPCallListener(new CallStatusListener(new OnCallStatusListener() {
@Override
public void onCallWait(SurfaceView localVideo) {
for (OnCallStatusListener listener : listeners) {
listener.onCallWait(localVideo);
}
}
@Override
public void onCallStart(String userId, SurfaceView remoteVideo) {
for (OnCallStatusListener listener : listeners) {
listener.onCallStart(userId, remoteVideo);
}
startTimer(null);
}
@Override
public void onCallEnd() {
for (OnCallStatusListener listener : listeners) {
listener.onCallEnd();
}
endTimer();
}
@Override
public void onStartFirstFrame() {
for (OnCallStatusListener listener : listeners) {
listener.onStartFirstFrame();
}
}
}));
}
public void removeOnVoIPCallListener(OnCallStatusListener statusListener) {
@@ -193,37 +224,6 @@ public class CallClientManager {
}
public void acceptCall(String callId) {
RongCallClient.getInstance().setVoIPCallListener(new CallStatusListener(new OnCallStatusListener() {
@Override
public void onCallWait(SurfaceView localVideo) {
for (OnCallStatusListener listener : listeners) {
listener.onCallWait(localVideo);
}
}
@Override
public void onCallStart(String userId, SurfaceView remoteVideo) {
for (OnCallStatusListener listener : listeners) {
listener.onCallStart(userId, remoteVideo);
}
startTimer(null);
}
@Override
public void onCallEnd() {
for (OnCallStatusListener listener : listeners) {
listener.onCallEnd();
}
endTimer();
}
@Override
public void onStartFirstFrame() {
for (OnCallStatusListener listener : listeners) {
listener.onStartFirstFrame();
}
}
}));
RongCallClient.getInstance().acceptCall(callId);
}

26
OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java
View File

@@ -88,7 +88,7 @@ public class OTONetManager {
@Override
public void accept(ResponseModel<IMLoginModel> imLoginModelResponseModel) throws Exception {
if (callback != null) {
if(imLoginModelResponseModel.isError()){
if (imLoginModelResponseModel.isError()) {
JSONObject jsonSrc = imLoginModelResponseModel.getSrcJSONOBject();
callback.onError(jsonSrc.getJSONObject("data").getString("msg"));
return;
@@ -1370,7 +1370,7 @@ public class OTONetManager {
}
public void getMenu( HttpCallback<List<UserItemBean>> callback) {
public void getMenu(HttpCallback<List<UserItemBean>> callback) {
API.get().otoApi(mContext).
getMenu()
.subscribeOn(Schedulers.io())
@@ -1394,5 +1394,27 @@ public class OTONetManager {
}).isDisposed();
}
public void messageReadAll(HttpCallback<HttpCallbackModel> callback) {
API.get().otoApi(mContext).
messageReadAll()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(listResponseModel -> {
if (listResponseModel.getData().getCode() == 0) {
if(callback!=null) {
callback.onSuccess(new HttpCallbackModel(listResponseModel.getData().getCode(), listResponseModel.getData().getMsg()));
}
} else {
if(callback!=null) {
callback.onError(listResponseModel.getData().getMsg());
}
}
}, throwable -> {
if (callback != null) {
callback.onError(mContext.getString(com.yunbao.common.R.string.net_error));
}
}).isDisposed();
}
}

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

@@ -363,6 +363,8 @@ public interface OneToOneApi {
*/
@GET("/api/public/?service=Friendappinfos.getMenu")
Observable<ResponseModel<List<UserItemBean>>> getMenu();
@GET("/api/public/?service=Message.setMessageReadAll")
Observable<ResponseModel<List<BaseModel>>> messageReadAll();
}

15
OneToOne/src/main/java/com/shayu/onetoone/utils/ChatPluginExtensionConfig.java Normal file
View File

@@ -0,0 +1,15 @@
package com.shayu.onetoone.utils;
import java.util.ArrayList;
import java.util.List;
import io.rong.imkit.conversation.extension.DefaultExtensionConfig;
import io.rong.imkit.conversation.extension.component.plugin.IPluginModule;
import io.rong.imlib.model.Conversation;
public class ChatPluginExtensionConfig extends DefaultExtensionConfig {
@Override
public List<IPluginModule> getPluginModules(Conversation.ConversationType conversationType, String targetId) {
return new ArrayList<>();
}
}

13
OneToOne/src/main/java/com/shayu/onetoone/view/AbsInputPanel.java
View File

@@ -10,6 +10,7 @@ import com.yunbao.common.utils.ToastUtil;
import java.lang.reflect.Field;
import androidx.fragment.app.FragmentActivity;
import io.rong.imkit.conversation.extension.RongExtension;
public abstract class AbsInputPanel {
@@ -19,6 +20,7 @@ public abstract class AbsInputPanel {
String targetId;
ViewGroup rootLayout;
View rootView;
boolean isShow = false;
public AbsInputPanel(String targetId, FragmentActivity mContext, RongExtension mRongExtension, int layout) {
this.mContext = mContext;
@@ -38,16 +40,23 @@ public abstract class AbsInputPanel {
}
public int show() {
if (rootLayout.getVisibility() == View.VISIBLE) {
rootLayout.removeAllViews();
if (isShow) {
rootLayout.setVisibility(View.GONE);
isShow = false;
return View.GONE;
}
rootLayout.removeAllViews();
isShow = true;
rootLayout.addView(rootView);
rootLayout.setVisibility(View.VISIBLE);
return View.VISIBLE;
}
public void hide() {
rootLayout.removeAllViews();
rootLayout.setVisibility(View.GONE);
}
public abstract void init(View viewGroup);
}

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

@@ -1,5 +1,6 @@
package com.shayu.onetoone.view;
import android.app.Dialog;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
@@ -16,6 +17,7 @@ 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.OnDialogClickListener;
import com.shayu.onetoone.listener.OnSendMessageListener;
import com.shayu.onetoone.manager.OTONetManager;
import com.shayu.onetoone.manager.SendMessageManager;
@@ -96,8 +98,15 @@ public class MsgInputPanelForGift extends AbsInputPanel {
public void onError(int status, String msg) {
super.onError(status, msg);
new TipsDialog(mContext)
.setTitle(WordUtil.getNewString(R.string.not_money))
.setApplyText(WordUtil.getNewString(R.string.dialog_apply))
.setTitle(WordUtil.getNewString(R.string.gift_not_money))
.setApplyText(WordUtil.getNewString(R.string.money_apply))
.setOnDialogClickListener(new OnDialogClickListener() {
@Override
public void onApply(Dialog dialog) {
super.onApply(dialog);
ToastUtil.showDebug("沒有H5頁面！");
}
})
.showDialog();
}
});