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

新增新用户注册后FirebaseAnalytics.logEvent调用

Browse Source 
尝试修复美颜会闪屏问题（待观察）
修复跨机子设置备注不显示在列表上的问题
修复聊天列表会出现PK消息的问题
This commit is contained in:
zlzw
2024-06-06 15:30:17 +08:00
parent 405909f3b3
commit 4628079ac7
12 changed files with 217 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@@ -239,7 +239,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
.postDelayed(new Runnable() {
@Override
public void run() {
// DebugDialog.getInstance(mContext).setParams("测试版本","1.00");
// DebugDialog.getInstance(mContext).setParams("测试版本","1.00");
ConversationIMListManager.get(mContext).addUserInfoProvider();
MessageIMManager.get(mContext).resetImUnReadMessageCount(mContext);
}
@@ -295,8 +295,8 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal),isSw);
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk, boolean isSw) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal), isSw);
}
@Override
@@ -517,8 +517,8 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal),isSw);
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk, boolean isSw) {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal), isSw);
}
@Override
@@ -588,7 +588,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
private void requestNotReadMessage() {
}
private void showFirstLogin() {
@@ -596,6 +596,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Override
public void onSuccess(FirstLoginBean data) {
if (data.getStatus() == 0) {
Bundle bundle = new Bundle();
bundle.putString("uid", IMLoginManager.get(mContext).getUserInfo().getId() + "");
GoogleUtils.newInstance(mContext).logEvent("sign_up",bundle);
mContext.startActivity(new Intent(mContext, CompleteUserInfoActivity.class));
}
}
@@ -1160,9 +1163,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
public void watchLive(LiveBean liveBean, String key, int position) {
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
@Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) {
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk, boolean isSw) {
MobclickAgent.onEvent(mContext, "home_page_enter_room", "首页点击直播间");
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal),isSw);
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal), isSw);
}
@Override
@@ -1502,11 +1505,11 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
*/
@Subscribe(threadMode = ThreadMode.MAIN)
public void userSignOut(RongIMConnectionStatusEvent model) {
if(model.getStatus()==-1) {
if (model.getStatus() == -1) {
IMLoginManager.get(mContext).logout(this);
CommonAppConfig.getInstance().clearLoginInfo();
LoginActivity.forward();
}else if(model.getStatus()==1){
} else if (model.getStatus() == 1) {
ConversationIMListManager.get(mContext).addUserInfoProvider();
}
}
@@ -1600,7 +1603,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
@Subscribe(threadMode = ThreadMode.MAIN)
public void onLiveFloatEvent(LiveFloatEvent event) {
if (event != null && event.getmLiveBean() != null && !TextUtils.isEmpty(event.getmLiveBean().getPull())) {
new Handler().post(() -> LiveFloatView.getInstance().cacheLiveData(event.getmLiveBean(), event.getmLiveType(), event.getmLiveSDK() ==Constants.LIVE_SDK_SW, event.getmLiveTypeVal()).builderFloat(mContext, event.getmLiveBean().getPull(), LiveAudienceActivity.class));
new Handler().post(() -> LiveFloatView.getInstance().cacheLiveData(event.getmLiveBean(), event.getmLiveType(), event.getmLiveSDK() == Constants.LIVE_SDK_SW, event.getmLiveTypeVal()).builderFloat(mContext, event.getmLiveBean().getPull(), LiveAudienceActivity.class));
}
}
@@ -1613,9 +1616,9 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
floatWarOrder.setVisibility(View.VISIBLE);
}
}*/
if(floatWarOrder.getTag()!=null){
if (floatWarOrder.getTag() != null) {
floatWarOrder.setVisibility(View.VISIBLE);
}else{
} else {
floatWarOrder.setVisibility(View.GONE);
}
}

2
main/src/main/java/com/yunbao/main/fragment/MainMessageChatListFragment.java
View File

@@ -15,6 +15,7 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.yunbao.common.interfaces.OnRecyclerListRefreshListener;
import com.yunbao.common.manager.InstructorRemarkManager;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.live.R;
@@ -57,6 +58,7 @@ public class MainMessageChatListFragment extends AbsMainMessageChatListFragment
conversationListFragment.getAdapter().setOnRefreshListener(new OnRecyclerListRefreshListener<List<BaseUiConversation>>() {
@Override
public void onFinish(List<BaseUiConversation> baseUiConversations) {
InstructorRemarkManager.get(mContext).getNetInstructorRemark();
loadLiveLookTime(baseUiConversations, new OnRecyclerListRefreshListener<Map<String, Integer>>() {
@Override
public void onFinish(Map<String, Integer> stringIntegerMap) {