moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:完成core模块包名修改

Browse Source
This commit is contained in:
Max
2023-11-09 00:15:20 +08:00
parent 8f7759b032
commit 30e5fe44bf
2299 changed files with 9487 additions and 8400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/pikolive/app/AgentActivity.java
View File

@@ -12,10 +12,10 @@ import com.mob.moblink.Scene;
import com.mob.moblink.SceneRestorable;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.pikolive.app.other.activity.SplashActivity;
import com.yizhuan.xchat_android_core.linked.LinkedModel;
import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.TextUtils;
import com.pikolive.core.linked.LinkedModel;
import com.pikolive.core.linked.bean.LinkedInfo;
import com.pikolive.core.user.UserModel;
import com.pikolive.core.utils.TextUtils;
import java.util.HashMap;
import java.util.List;

80
app/src/main/java/com/pikolive/app/MainActivity.java
View File

@@ -1,6 +1,6 @@
package com.pikolive.app;
import static com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE;
import static com.pikolive.core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE;
import android.animation.ObjectAnimator;
import android.annotation.SuppressLint;
@@ -64,7 +64,7 @@ import com.pikolive.app.main.helper.NoticationsUiHelper;
import com.yizhuan.erban.miniworld.activity.MiniWorldGuestPageActivity;
import com.pikolive.app.module.Extras;
import com.yizhuan.erban.module_hall.secretcode.PwdCodeMgr;
import com.yizhuan.erban.service.DaemonService;
import com.pikolive.app.service.DaemonService;
import com.pikolive.app.ui.im.ImInitHelper;
import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity;
import com.pikolive.app.ui.login.BindPhoneActivity;
@@ -80,43 +80,43 @@ import com.pikolive.app.ui.widget.LivingIconView;
import com.pikolive.app.ui.widget.MainTabLayout;
import com.pikolive.app.utils.CleanLeakUtils;
import com.pikolive.app.utils.PushMessageHandler;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.DemoCache;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.event.KickOutEvent;
import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
import com.yizhuan.xchat_android_core.auth.event.LogoutEvent;
import com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel;
import com.yizhuan.xchat_android_core.community.event.SquareTaskEvent;
import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent;
import com.yizhuan.xchat_android_core.home.bean.MainTabType;
import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent;
import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent;
import com.yizhuan.xchat_android_core.home.model.GameHomeModel;
import com.yizhuan.xchat_android_core.home.model.HomeModel;
import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.linked.LinkedModel;
import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMBroadcastManager;
import com.yizhuan.xchat_android_core.manager.IMMessageManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.patriarch.event.CloseMinRoomEvent;
import com.yizhuan.xchat_android_core.patriarch.event.ImPushMsgPmLimitTimeEvent;
import com.yizhuan.xchat_android_core.patriarch.event.PmDismissAllLimitDialogEvent;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent;
import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent;
import com.yizhuan.xchat_android_core.user.event.NeedBindPhoneEvent;
import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent;
import com.yizhuan.xchat_android_core.user.event.NeedVerifyBoundAuthCodeEvent;
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.StringUtils;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.pikolive.core.Constants;
import com.pikolive.core.DemoCache;
import com.pikolive.core2.UriProvider;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.auth.event.KickOutEvent;
import com.pikolive.core.auth.event.LoginEvent;
import com.pikolive.core.auth.event.LogoutEvent;
import com.pikolive.core.channel_page.model.ChannelPageModel;
import com.pikolive.core.community.event.SquareTaskEvent;
import com.pikolive.core.community.event.UnReadCountEvent;
import com.pikolive.core2.home.bean.MainTabType;
import com.pikolive.core2.home.event.RefreshHomeDataEvent;
import com.pikolive.core2.home.event.VisitorUnreadCountEvent;
import com.pikolive.core2.home.model.GameHomeModel;
import com.pikolive.core2.home.model.HomeModel;
import com.pikolive.core.initial.InitialModel;
import com.pikolive.core.linked.LinkedModel;
import com.pikolive.core.linked.bean.LinkedInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.manager.IMBroadcastManager;
import com.pikolive.core.manager.IMMessageManager;
import com.pikolive.core.manager.RoomEvent;
import com.pikolive.core.patriarch.event.CloseMinRoomEvent;
import com.pikolive.core.patriarch.event.ImPushMsgPmLimitTimeEvent;
import com.pikolive.core.patriarch.event.PmDismissAllLimitDialogEvent;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.user.UserModel;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.core.user.event.LoadLoginUserInfoEvent;
import com.pikolive.core.user.event.LoginUserInfoUpdateEvent;
import com.pikolive.core.user.event.NeedBindPhoneEvent;
import com.pikolive.core.user.event.NeedCompleteInfoEvent;
import com.pikolive.core.user.event.NeedVerifyBoundAuthCodeEvent;
import com.pikolive.core.utils.CurrentTimeUtils;
import com.pikolive.core.utils.SharedPreferenceUtils;
import com.pikolive.core.utils.StringUtils;
import com.pikolive.core.utils.net.BeanObserver;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.threadmgr.ThreadPoolManager;
import com.pikolive.library.utils.JavaUtil;
@@ -567,7 +567,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
.subscribe(new BeanObserver<Boolean>() {
@Override
public void onErrorMsg(String error) {
com.yizhuan.xchat_android_core.utils.Logger.info("isBoundAuthCode", error);
com.pikolive.core.utils.Logger.info("isBoundAuthCode", error);
}
@Override

12
app/src/main/java/com/pikolive/app/NimMiddleActivity.java
View File

@@ -16,12 +16,12 @@ import com.pikolive.app.radish.signin.SignInActivity;
import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity;
import com.pikolive.app.ui.webview.CommonWebViewActivity;
import com.pikolive.app.utils.PushMessageHandler;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.OpenRoomNotiAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomInviteFansAttachment;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.im.custom.bean.CustomAttachment;
import com.pikolive.core.im.custom.bean.OpenRoomNotiAttachment;
import com.pikolive.core.im.custom.bean.OpenSignInAttachment;
import com.pikolive.core.im.custom.bean.RedPackageAttachment;
import com.pikolive.core.im.custom.bean.RoomInviteFansAttachment;
import com.pikolive.library.utils.UIUtils;
import java.util.ArrayList;

4
app/src/main/java/com/pikolive/app/UIHelper.java
View File

@@ -15,8 +15,8 @@ import com.pikolive.app.ui.user.activity.UserInfoActivity;
import com.pikolive.app.ui.user.activity.UserInfoModifyActivity;
import com.pikolive.app.ui.user.activity.UserModifyPhotosActivity;
import com.pikolive.app.ui.webview.CommonWebViewActivity;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.pikolive.core2.UriProvider;
import com.pikolive.core.user.bean.UserInfo;
/**

2
app/src/main/java/com/pikolive/app/UserGuideActivity.java
View File

@@ -10,7 +10,7 @@ import androidx.viewpager.widget.ViewPager;
import com.pikolive.app.base.BaseActivity;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.PreferencesUtils;
import com.pikolive.core.PreferencesUtils;
public class UserGuideActivity extends BaseActivity {

26
app/src/main/java/com/pikolive/app/application/GlobalHandleManager.java
View File

@@ -5,23 +5,23 @@ import android.app.Activity;
import com.tongdaxing.erban.upgrade.AppUpgradeHelper;
import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
import com.pikolive.app.avroom.newuserchargegift.NewUserChargePrizeDialog;
import com.yizhuan.erban.relation.cp.dialog.CpGlobalDialog;
import com.pikolive.app.relation.cp.dialog.CpGlobalDialog;
import com.pikolive.app.ui.widget.LevelUpDialog;
import com.pikolive.app.ui.widget.RecallDialog;
import com.pikolive.app.vip.dialog.VipUpgradeDialog;
import com.yizhuan.erban.ui.widget.lottery_dialog.LotteryDialogManager;
import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo;
import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent;
import com.yizhuan.xchat_android_core.level.event.LevelUpEvent;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent;
import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo;
import com.yizhuan.xchat_android_core.recall.event.CheckLostUserEvent;
import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo;
import com.yizhuan.xchat_android_core.upgrade.event.ImPushUpdateAppEvent;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.vip.VipUpgradeEvent;
import com.pikolive.core.activity.bean.LotteryInfo;
import com.pikolive.core.level.event.CharmLevelUpEvent;
import com.pikolive.core.level.event.LevelUpEvent;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.pay.event.NewUserChargeEvent;
import com.pikolive.core.recall.bean.CheckLostUserInfo;
import com.pikolive.core.recall.event.CheckLostUserEvent;
import com.pikolive.core.relation.cp.CpInviteInfo;
import com.pikolive.core.upgrade.event.ImPushUpdateAppEvent;
import com.pikolive.core.user.UserModel;
import com.pikolive.core.utils.SharedPreferenceUtils;
import com.pikolive.core.vip.VipUpgradeEvent;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;

58
app/src/main/java/com/pikolive/app/application/XChatApplication.java
View File

@@ -1,6 +1,6 @@
package com.pikolive.app.application;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI;
import android.annotation.SuppressLint;
import android.app.Activity;
@@ -51,34 +51,34 @@ import com.pikolive.app.common.util.AppLifeCycleHelper;
import com.yizhuan.erban.module_hall.HallDataManager;
import com.pikolive.app.radish.wallet.RadishWalletManager;
import com.pikolive.app.utils.PushMessageHandler;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.DemoCache;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.channel.ChannelModel;
import com.yizhuan.xchat_android_core.family.model.FamilyModel;
import com.yizhuan.xchat_android_core.gift.GiftModel;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment;
import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.interceptor.NoParamsInterceptor;
import com.yizhuan.xchat_android_core.interceptor.ParamsInterceptor;
import com.yizhuan.xchat_android_core.interceptor.TimeSyncInterceptor;
import com.yizhuan.xchat_android_core.manager.IMMessageManager;
import com.yizhuan.xchat_android_core.manager.IMSystemMsgManager;
import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel;
import com.yizhuan.xchat_android_core.mentoring_relationship.model.MentoringRelationshipModel;
import com.yizhuan.xchat_android_core.pay.PayModel;
import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel;
import com.yizhuan.xchat_android_core.radish.RadishModel;
import com.yizhuan.xchat_android_core.radish.signin.bean.ImNotice;
import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.net.ServerException;
import com.pikolive.core2.XChatConstants;
import com.pikolive.core.Constants;
import com.pikolive.core.DemoCache;
import com.pikolive.core2.UriProvider;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.bean.response.ServiceResult;
import com.pikolive.core2.channel.ChannelModel;
import com.pikolive.core.family.model.FamilyModel;
import com.pikolive.core.gift.GiftModel;
import com.pikolive.core.im.custom.bean.CustomAttachment;
import com.pikolive.core.im.custom.bean.OpenSignInAttachment;
import com.pikolive.core.initial.InitialModel;
import com.pikolive.core.interceptor.NoParamsInterceptor;
import com.pikolive.core.interceptor.ParamsInterceptor;
import com.pikolive.core.interceptor.TimeSyncInterceptor;
import com.pikolive.core.manager.IMMessageManager;
import com.pikolive.core.manager.IMSystemMsgManager;
import com.pikolive.core2.market_verify.MarketVerifyModel;
import com.pikolive.core.mentoring_relationship.model.MentoringRelationshipModel;
import com.pikolive.core.pay.PayModel;
import com.pikolive.core.public_chat_hall.model.PublicChatHallModel;
import com.pikolive.core.radish.RadishModel;
import com.pikolive.core.radish.signin.bean.ImNotice;
import com.pikolive.core.room.face.DynamicFaceModel;
import com.pikolive.core.user.UserModel;
import com.pikolive.core.user.event.NeedCompleteInfoEvent;
import com.pikolive.core.utils.SharedPreferenceUtils;
import com.pikolive.core.utils.net.ServerException;
import com.pikolive.library.common.application.BaseApp;
import com.pikolive.library.common.application.Env;
import com.pikolive.library.common.file.FileHelper;

16
app/src/main/java/com/pikolive/app/audio/AudioRecordActivity.java
View File

@@ -16,14 +16,14 @@ import com.yizhuan.erban.R;
import com.pikolive.app.base.BaseViewBindingActivity;
import com.pikolive.app.common.widget.dialog.DialogManager;
import com.yizhuan.erban.databinding.ActivityAudiorecordBinding;
import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.file.FileModel;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.pikolive.core.audio.AudioPlayAndRecordManager;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.file.FileModel;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.model.AvRoomModel;
import com.pikolive.core.user.UserModel;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.library.utils.ResUtil;
import com.pikolive.library.utils.log.MLog;

2
app/src/main/java/com/pikolive/app/audio/MyVoiceActivity.java
View File

@@ -21,7 +21,7 @@ import com.pikolive.app.base.BaseMvpActivity;
import com.pikolive.app.common.NoDataFragment;
import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil;
import com.pikolive.app.ui.widget.recyclerview.decoration.HorizontalDecoration;
import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo;
import com.pikolive.core2.audio.bean.UserVoiceInfo;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.utils.ListUtils;
import com.pikolive.library.utils.ResUtil;

4
app/src/main/java/com/pikolive/app/audio/RecordingVoiceActivity.java
View File

@@ -42,8 +42,8 @@ import com.pikolive.app.audio.widget.VoiceCardRecyclerView;
import com.pikolive.app.audio.widget.VoiceWave;
import com.pikolive.app.base.BaseMvpActivity;
import com.pikolive.app.common.widget.dialog.DialogManager;
import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.pikolive.core2.audio.bean.VoiceCardInfo;
import com.pikolive.core.room.model.AvRoomModel;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.utils.ResUtil;

6
app/src/main/java/com/pikolive/app/audio/SoundSignatureActivity.kt
View File

@@ -23,9 +23,9 @@ import com.pikolive.app.audio.viewmodel.SoundViewModel
import com.pikolive.app.base.BaseViewBindingActivity
import com.yizhuan.erban.databinding.ActivitySoundSignatureBinding
import com.pikolive.app.ui.widget.dialog.CommonDialog
import com.yizhuan.xchat_android_core.file.FileModel
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.user.bean.UserInfo.SoundBean
import com.pikolive.core.file.FileModel
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.user.bean.UserInfo.SoundBean
import com.pikolive.library.utils.ResUtil
import com.pikolive.library.utils.SingleToastUtil
import io.reactivex.SingleObserver

20
app/src/main/java/com/pikolive/app/audio/VoiceMatchActivity.java
View File

@@ -31,16 +31,16 @@ import com.pikolive.app.common.widget.dialog.DialogManager;
import com.yizhuan.erban.databinding.ActivityVoiceMatchBinding;
import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity;
import com.pikolive.app.ui.widget.higuide.TuTuGuideHelper;
import com.yizhuan.xchat_android_core.audio.AudioModel;
import com.yizhuan.xchat_android_core.audio.bean.HistoryVoiceInfo;
import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.music.model.PlayerModel;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.ActivityUtil;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.pikolive.core2.audio.AudioModel;
import com.pikolive.core2.audio.bean.HistoryVoiceInfo;
import com.pikolive.core2.audio.bean.VoiceMatchInfo;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.music.model.PlayerModel;
import com.pikolive.core.user.UserModel;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.core.utils.ActivityUtil;
import com.pikolive.core.utils.SharedPreferenceUtils;
import com.pikolive.core.utils.net.DontWarnObserver;
import com.pikolive.library.utils.ListUtils;
import com.pikolive.library.utils.ResUtil;
import com.pikolive.library.utils.SingleToastUtil;

2
app/src/main/java/com/pikolive/app/audio/adapter/CardAdapter.java
View File

@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo;
import com.pikolive.core2.audio.bean.VoiceCardInfo;
import java.util.ArrayList;
import java.util.List;

4
app/src/main/java/com/pikolive/app/audio/adapter/MyVoiceListAdapter.java
View File

@@ -12,8 +12,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.pikolive.app.audio.widget.VoiceLine;
import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo;
import com.yizhuan.xchat_android_core.utils.StringUtils;
import com.pikolive.core2.audio.bean.UserVoiceInfo;
import com.pikolive.core.utils.StringUtils;
import com.pikolive.library.utils.ResUtil;
import java.util.List;

8
app/src/main/java/com/pikolive/app/audio/presenter/MyVoicePresenter.java
View File

@@ -2,10 +2,10 @@ package com.pikolive.app.audio.presenter;
import com.pikolive.app.audio.view.IMyVoiceView;
import com.pikolive.app.base.BaseMvpPresenter;
import com.yizhuan.xchat_android_core.audio.AudioModel;
import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.pikolive.core2.audio.AudioModel;
import com.pikolive.core2.audio.bean.UserVoiceInfo;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.utils.net.DontWarnObserver;
import com.pikolive.library.base.PresenterEvent;
import java.util.List;

18
app/src/main/java/com/pikolive/app/audio/presenter/RecordingVoicePresenter.java
View File

@@ -15,15 +15,15 @@ import com.pikolive.app.audio.helper.OnPlayListener;
import com.pikolive.app.audio.view.IRecordingVoiceView;
import com.yizhuan.erban.R;
import com.pikolive.app.base.BaseMvpPresenter;
import com.yizhuan.xchat_android_core.audio.AudioModel;
import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager;
import com.yizhuan.xchat_android_core.audio.bean.SaveVoiceSuccessResultInfo;
import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.file.FileModel;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.pikolive.core2.audio.AudioModel;
import com.pikolive.core.audio.AudioPlayAndRecordManager;
import com.pikolive.core2.audio.bean.SaveVoiceSuccessResultInfo;
import com.pikolive.core2.audio.bean.VoiceCardInfo;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.file.FileModel;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.utils.net.DontWarnObserver;
import com.pikolive.library.base.PresenterEvent;
import com.pikolive.library.utils.ListUtils;
import com.pikolive.library.utils.ResUtil;

2
app/src/main/java/com/pikolive/app/audio/view/BottleContainer.java
View File

@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo;
import com.pikolive.core2.audio.bean.VoiceMatchInfo;
import com.pikolive.library.utils.ListUtils;
import java.util.ArrayList;

12
app/src/main/java/com/pikolive/app/audio/view/BottleLayout.java
View File

@@ -23,12 +23,12 @@ import com.pikolive.app.UIHelper;
import com.pikolive.app.common.widget.CircleImageView;
import com.pikolive.app.ui.utils.ImageLoadUtils;
import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.pikolive.core2.XChatConstants;
import com.pikolive.core2.audio.bean.VoiceMatchInfo;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.utils.SharedPreferenceUtils;
import com.pikolive.core.utils.net.DontWarnObserver;
import com.pikolive.core.utils.net.RxHelper;
import com.pikolive.library.utils.ResUtil;
import com.pikolive.library.utils.SingleToastUtil;
import com.pikolive.library.utils.TimeUtils;

2
app/src/main/java/com/pikolive/app/audio/view/IBottleOpListener.java
View File

@@ -1,6 +1,6 @@
package com.pikolive.app.audio.view;
import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo;
import com.pikolive.core2.audio.bean.VoiceMatchInfo;
/**
* create by lvzebiao @2019/6/19

2
app/src/main/java/com/pikolive/app/audio/view/IMyVoiceView.java
View File

@@ -1,6 +1,6 @@
package com.pikolive.app.audio.view;
import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo;
import com.pikolive.core2.audio.bean.UserVoiceInfo;
import com.pikolive.library.base.IMvpBaseView;
import java.util.List;

2
app/src/main/java/com/pikolive/app/audio/view/IRecordingVoiceView.java
View File

@@ -2,7 +2,7 @@ package com.pikolive.app.audio.view;
import android.content.Intent;
import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo;
import com.pikolive.core2.audio.bean.VoiceCardInfo;
import com.pikolive.library.base.IMvpBaseView;
import java.util.List;

17
app/src/main/java/com/pikolive/app/audio/viewmodel/SoundViewModel.kt
View File

@@ -11,13 +11,13 @@ import com.pikolive.app.audio.SoundSignatureActivity
import com.pikolive.app.audio.helper.AudioPlayerHelper
import com.pikolive.app.audio.helper.OnPlayListener
import com.pikolive.app.base.BaseViewModel
import com.yizhuan.xchat_android_core.Constants
import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.manager.AudioEngineManager
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.sound.model.SoundModel
import com.yizhuan.xchat_android_core.utils.toast
import com.pikolive.core.Constants
import com.pikolive.core.audio.AudioPlayAndRecordManager
import com.pikolive.core.auth.AuthModel
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core2.sound.model.SoundModel
import com.pikolive.core.utils.toast
import com.pikolive.core2.manager.AudioEngineManager
import com.pikolive.library.common.application.BaseApp
import com.pikolive.library.utils.ResUtil
import com.pikolive.library.utils.SingleToastUtil
@@ -339,7 +339,8 @@ class SoundViewModel : BaseViewModel() {
if (AvRoomDataManager.get().mCurrentRoomInfo != null) {
AudioEngineManager.get().isRemoteMute = true //設置靜音
AudioEngineManager.get().isMute = true //不能説話
AudioEngineManager.get().setRole(Constants.CLIENT_ROLE_AUDIENCE)
AudioEngineManager.get().setRole(
Constants.CLIENT_ROLE_AUDIENCE)
}
}

34
app/src/main/java/com/pikolive/app/avroom/ButtonItemFactory.java
View File

@@ -20,23 +20,23 @@ import com.pikolive.app.ui.widget.ButtonItem;
import com.pikolive.app.ui.widget.GiftDialog;
import com.pikolive.app.vip.util.VipHelper;
import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.initial.bean.InitInfo;
import com.yizhuan.xchat_android_core.kick.KickModel;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.statistic.StatLogKey;
import com.yizhuan.xchat_android_core.super_admin.bean.KickOutExtBean;
import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel;
import com.yizhuan.xchat_android_core.super_admin.util.SAdminOptUtil;
import com.yizhuan.xchat_android_core.super_admin.util.SaAttachmentFactory;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.bean.RoomQueueInfo;
import com.pikolive.core.initial.InitialModel;
import com.pikolive.core.initial.bean.InitInfo;
import com.pikolive.core.kick.KickModel;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core2.manager.IMNetEaseManager;
import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.model.AvRoomModel;
import com.pikolive.core.statistic.StatLogKey;
import com.pikolive.core.admin.bean.KickOutExtBean;
import com.pikolive.core.admin.model.SuperAdminModel;
import com.pikolive.core.admin.util.SAdminOptUtil;
import com.pikolive.core.admin.util.SaAttachmentFactory;
import com.pikolive.core.admin.util.SuperAdminUtil;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.library.utils.JavaUtil;
import com.pikolive.library.utils.ResUtil;
import com.pikolive.library.utils.SingleToastUtil;

146
app/src/main/java/com/pikolive/app/avroom/activity/AVRoomActivity.java
View File

@@ -1,19 +1,19 @@
package com.pikolive.app.avroom.activity;
import static android.view.View.VISIBLE;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_PK;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_NOTIFY;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_PK;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5;
import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_NOTIFY;
import android.annotation.SuppressLint;
import android.app.Activity;
@@ -59,6 +59,7 @@ import com.orhanobut.logger.Logger;
import com.pikolive.app.avroom.firstcharge.FirstChargeDialog;
import com.pikolive.app.avroom.fragment.FakeSingleRoomBackFragment;
import com.pikolive.app.avroom.fragment.FakeSingleRoomFragment;
import com.pikolive.app.avroom.fragment.HomePartyFragment;
import com.pikolive.app.avroom.fragment.InputPwdDialogFragment;
import com.pikolive.app.avroom.presenter.AvRoomPresenter;
import com.pikolive.app.avroom.presenter.HomePartyPresenter;
@@ -68,7 +69,6 @@ import com.trello.rxlifecycle3.android.ActivityEvent;
import com.yizhuan.erban.R;
import com.pikolive.app.avroom.dialog.NewUserGiftDialog;
import com.pikolive.app.avroom.dialog.SingleRoomTipDialog;
import com.pikolive.app.avroom.fragment.HomePartyFragment;
import com.pikolive.app.avroom.widget.VerticalViewPagerAdapter;
import com.pikolive.app.base.BaseMvpActivity;
import com.pikolive.app.common.util.Utils;
@@ -87,65 +87,65 @@ import com.pikolive.app.ui.widget.dialog.AllServiceGiftLevelDialog;
import com.pikolive.app.ui.widget.dialog.MonsterDialog;
import com.pikolive.app.utils.UserUtils;
import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.DemoCache;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.event.LogoutEvent;
import com.yizhuan.xchat_android_core.bean.BaseProtocol;
import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo;
import com.yizhuan.xchat_android_core.gift.GiftModel;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.FairyMsgAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.NotifyH5Attachment;
import com.yizhuan.xchat_android_core.im.custom.bean.NotifyH5Info;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeInfo;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPKAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomReceivedLuckyGiftAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.TarotAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.TarotMsgBean;
import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol;
import com.yizhuan.xchat_android_core.monsterhunting.manager.MonsterDataManager;
import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol;
import com.yizhuan.xchat_android_core.noble.NobleInfo;
import com.yizhuan.xchat_android_core.noble.NobleResourceType;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.patriarch.event.CloseMinRoomEvent;
import com.yizhuan.xchat_android_core.patriarch.event.ImPushMsgPmLimitTimeEvent;
import com.yizhuan.xchat_android_core.patriarch.event.PmDismissAllLimitDialogEvent;
import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException;
import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo;
import com.yizhuan.xchat_android_core.room.anotherroompk.ShowGiftDialogEvent;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomModeType;
import com.yizhuan.xchat_android_core.room.dragonball.DragonBallModel;
import com.yizhuan.xchat_android_core.room.event.FinishAvRoomEvent;
import com.yizhuan.xchat_android_core.room.event.RoomExitEvent;
import com.yizhuan.xchat_android_core.room.event.RoomTaskTipsEvent;
import com.yizhuan.xchat_android_core.room.pk.event.PKStateEvent;
import com.yizhuan.xchat_android_core.super_admin.util.SAdminOptUtil;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.support.room.RoomContext;
import com.yizhuan.xchat_android_core.support.room.RoomView;
import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.FirstChargeInfo;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.LogUtils;
import com.yizhuan.xchat_android_core.utils.StringUtils;
import com.pikolive.core.Constants;
import com.pikolive.core.DemoCache;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.auth.event.LogoutEvent;
import com.pikolive.core.bean.BaseProtocol;
import com.pikolive.core.channel_page.bean.HelloMessageInfo;
import com.pikolive.core.gift.GiftModel;
import com.pikolive.core.gift.bean.GiftInfo;
import com.pikolive.core.gift.bean.LuckyBagNoticeInfo;
import com.pikolive.core.im.custom.bean.CustomAttachment;
import com.pikolive.core.im.custom.bean.FairyMsgAttachment;
import com.pikolive.core.im.custom.bean.NotifyH5Attachment;
import com.pikolive.core.im.custom.bean.NotifyH5Info;
import com.pikolive.core.im.custom.bean.RoomBoxPrizeAttachment;
import com.pikolive.core.im.custom.bean.RoomBoxPrizeInfo;
import com.pikolive.core.im.custom.bean.RoomLuckySeaAttachment;
import com.pikolive.core.im.custom.bean.RoomLuckySeaMsgBean;
import com.pikolive.core.im.custom.bean.RoomPKAttachment;
import com.pikolive.core.im.custom.bean.RoomPkBean;
import com.pikolive.core.im.custom.bean.RoomReceivedLuckyGiftAttachment;
import com.pikolive.core.im.custom.bean.TarotAttachment;
import com.pikolive.core.im.custom.bean.TarotMsgBean;
import com.pikolive.core.initial.InitialModel;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core2.manager.IMNetEaseManager;
import com.pikolive.core.manager.RoomEvent;
import com.pikolive.core.module_hall.hall.HallModel;
import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo;
import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult;
import com.pikolive.core.monsterhunting.bean.MonsterInfo;
import com.pikolive.core.monsterhunting.bean.MonsterProtocol;
import com.pikolive.core.monsterhunting.manager.MonsterDataManager;
import com.pikolive.core.noble.AllServiceGiftProtocol;
import com.pikolive.core.noble.NobleInfo;
import com.pikolive.core.noble.NobleResourceType;
import com.pikolive.core.noble.NobleUtil;
import com.pikolive.core.patriarch.event.CloseMinRoomEvent;
import com.pikolive.core.patriarch.event.ImPushMsgPmLimitTimeEvent;
import com.pikolive.core.patriarch.event.PmDismissAllLimitDialogEvent;
import com.pikolive.core.patriarch.exception.PmRoomLimitException;
import com.pikolive.core.redpackage.RedPackageNotifyInfo;
import com.pikolive.core.room.anotherroompk.ShowGiftDialogEvent;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.bean.RoomModeType;
import com.pikolive.core.room.dragonball.DragonBallModel;
import com.pikolive.core.room.event.FinishAvRoomEvent;
import com.pikolive.core.room.event.RoomExitEvent;
import com.pikolive.core.room.event.RoomTaskTipsEvent;
import com.pikolive.core.room.pk.event.PKStateEvent;
import com.pikolive.core.admin.util.SAdminOptUtil;
import com.pikolive.core.admin.util.SuperAdminUtil;
import com.pikolive.core.support.room.RoomContext;
import com.pikolive.core.support.room.RoomView;
import com.pikolive.core2.treasurefairy.FairyMsgInfoBean;
import com.pikolive.core.user.UserModel;
import com.pikolive.core.user.bean.FirstChargeInfo;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.core.utils.LogUtils;
import com.pikolive.core.utils.StringUtils;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.rxbus.RxBus;
import com.pikolive.library.utils.ResUtil;

14
app/src/main/java/com/pikolive/app/avroom/activity/CpRoomInviteActivity.java
View File

@@ -7,13 +7,13 @@ import com.yizhuan.erban.R;
import com.pikolive.app.base.BaseBindingActivity;
import com.yizhuan.erban.databinding.ActivityCpRoomInviteBinding;
import com.yizhuan.erban.public_chat_hall.event.AitFriendEvent;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.RoomSettingModel;
import com.yizhuan.xchat_android_core.share.bean.SessionType;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core2.manager.IMNetEaseManager;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.model.RoomSettingModel;
import com.pikolive.core.share.bean.SessionType;
import com.pikolive.core.utils.net.DontWarnObserver;
import com.pikolive.library.annatation.ActLayoutRes;
import com.pikolive.library.utils.ResUtil;

10
app/src/main/java/com/pikolive/app/avroom/activity/CreatePKActivity.java
View File

@@ -22,11 +22,11 @@ import com.pikolive.app.avroom.dialog.PKTimePickerDialog;
import com.pikolive.app.base.BaseMvpActivity;
import com.pikolive.app.base.TitleBar;
import com.pikolive.app.common.widget.dialog.DialogManager;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
import com.yizhuan.xchat_android_core.room.pk.model.PkModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.pk.bean.PKMemberInfo;
import com.pikolive.core.room.pk.bean.PKTeamInfo;
import com.pikolive.core.room.pk.model.PkModel;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.utils.ResUtil;

2
app/src/main/java/com/pikolive/app/avroom/activity/RecordForPKActivity.java
View File

@@ -18,7 +18,7 @@ import com.pikolive.app.avroom.view.IRecordForPKView;
import com.pikolive.app.base.BaseMvpActivity;
import com.pikolive.app.common.util.Utils;
import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration;
import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordInfo;
import com.pikolive.core.room.pk.bean.PKRecordInfo;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.utils.ListUtils;
import com.pikolive.library.utils.ResUtil;

16
app/src/main/java/com/pikolive/app/avroom/activity/RoomBlackListActivity.java
View File

@@ -17,14 +17,14 @@ import com.yizhuan.erban.R;
import com.pikolive.app.avroom.adapter.RoomNormalListAdapter;
import com.pikolive.app.base.BaseMvpActivity;
import com.pikolive.app.common.widget.dialog.DialogManager;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.im.room.IIMRoomCoreClient;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.im.room.IIMRoomCoreClient;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.model.AvRoomModel;
import com.pikolive.core.admin.model.SuperAdminModel;
import com.pikolive.core.admin.util.SuperAdminUtil;
import com.pikolive.core.utils.net.DontWarnObserver;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.coremanager.CoreEvent;
import com.pikolive.library.utils.JavaUtil;

8
app/src/main/java/com/pikolive/app/avroom/activity/RoomInviteActivity.java
View File

@@ -18,10 +18,10 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener;
import com.yizhuan.erban.R;
import com.pikolive.app.avroom.adapter.RoomInviteAdapter;
import com.pikolive.app.base.BaseMvpActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.noble.NobleResourceType;
import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.pikolive.core.Constants;
import com.pikolive.core.noble.NobleResourceType;
import com.pikolive.core.room.bean.OnlineChatMember;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.utils.ListUtils;
import com.pikolive.library.utils.ResUtil;

4
app/src/main/java/com/pikolive/app/avroom/activity/RoomManagerListActivity.java
View File

@@ -16,8 +16,8 @@ import com.pikolive.app.avroom.adapter.RoomNormalListAdapter;
import com.pikolive.app.avroom.view.IRoomManagerView;
import com.pikolive.app.base.BaseMvpActivity;
import com.pikolive.app.common.widget.dialog.DialogManager;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.utils.ListUtils;
import com.pikolive.library.utils.ResUtil;

4
app/src/main/java/com/pikolive/app/avroom/activity/RoomOnlineUserActivity.java
View File

@@ -8,8 +8,8 @@ import com.pikolive.app.avroom.fragment.OnlineUserFragment;
import com.yizhuan.erban.R;
import com.pikolive.app.base.BaseBindingActivity;
import com.yizhuan.erban.databinding.ActivityRoomOnlineUserBinding;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.library.annatation.ActLayoutRes;
import com.pikolive.library.utils.ResUtil;

2
app/src/main/java/com/pikolive/app/avroom/activity/RoomRankListActivity.java
View File

@@ -13,7 +13,7 @@ import com.pikolive.app.avroom.fragment.RoomContributeListFragment;
import com.yizhuan.erban.R;
import com.pikolive.app.base.BaseBindingActivity;
import com.yizhuan.erban.databinding.ActivityRoomRankListBinding;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.library.annatation.ActLayoutRes;
import java.util.ArrayList;

40
app/src/main/java/com/pikolive/app/avroom/activity/RoomSettingActivity.java
View File

@@ -26,26 +26,26 @@ import com.pikolive.app.common.widget.dialog.DialogManager;
import com.yizhuan.erban.databinding.ActivityRoomSettingBinding;
import com.pikolive.app.ui.webview.CommonWebViewActivity;
import com.pikolive.app.utils.RegexUtil;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.event.KickOutEvent;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomNoticeAttachment;
import com.yizhuan.xchat_android_core.kick.KickModel;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomMessageViewNoticeInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo;
import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo;
import com.yizhuan.xchat_android_core.room.giftvalue.GiftValueModel;
import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.room.model.RoomSettingModel;
import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.pikolive.core2.UriProvider;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.auth.event.KickOutEvent;
import com.pikolive.core.bean.RoomQueueInfo;
import com.pikolive.core.im.custom.bean.CustomAttachment;
import com.pikolive.core.im.custom.bean.RoomNoticeAttachment;
import com.pikolive.core.kick.KickModel;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core2.manager.IMNetEaseManager;
import com.pikolive.core.manager.RoomEvent;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.bean.RoomMessageViewNoticeInfo;
import com.pikolive.core.room.bean.RoomSettingTabInfo;
import com.pikolive.core.room.bean.SingleRoomSortInfo;
import com.pikolive.core.room.giftvalue.GiftValueModel;
import com.pikolive.core.room.giftvalue.helper.GiftValueMrg;
import com.pikolive.core.room.model.AvRoomModel;
import com.pikolive.core.room.model.RoomSettingModel;
import com.pikolive.core.room.queue.bean.MicMemberInfo;
import com.pikolive.core.utils.net.BeanObserver;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.net.rxnet.callback.CallBack;
import com.pikolive.library.utils.CommonUtils;

8
app/src/main/java/com/pikolive/app/avroom/activity/RoomTitleEditActivity.java
View File

@@ -12,10 +12,10 @@ import com.yizhuan.erban.R;
import com.pikolive.app.base.BaseBindingActivity;
import com.pikolive.app.common.widget.dialog.DialogManager;
import com.yizhuan.erban.databinding.ActivityRoomTitleEditBinding;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.RoomSettingModel;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.model.RoomSettingModel;
import com.pikolive.library.annatation.ActLayoutRes;
import com.pikolive.library.utils.ResUtil;
import com.pikolive.library.utils.SingleToastUtil;

2
app/src/main/java/com/pikolive/app/avroom/adapter/AuctionListItem.java
View File

@@ -12,7 +12,7 @@ import android.widget.TextView;
import com.yizhuan.erban.R;
import com.pikolive.app.common.widget.CircleImageView;
import com.pikolive.app.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.room.auction.bean.AuctionListUserInfo;
import com.pikolive.core.room.auction.bean.AuctionListUserInfo;
import com.pikolive.library.list.BaseGroupItem;
import com.pikolive.library.list.ViewHolder;

30
app/src/main/java/com/pikolive/app/avroom/adapter/BaseMicroViewAdapter.java
View File

@@ -25,21 +25,21 @@ import com.pikolive.app.ui.utils.ImageLoadUtils;
import com.pikolive.app.ui.webview.DialogWebViewActivity;
import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil;
import com.pikolive.app.utils.RegexUtil;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.bean.RoomMicInfo;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.noble.NobleResourceType;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueData;
import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueFormat;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.ActivityUtil;
import com.yizhuan.xchat_android_core.utils.StringExtensionKt;
import com.pikolive.core2.UriProvider;
import com.pikolive.core.bean.RoomMicInfo;
import com.pikolive.core.bean.RoomQueueInfo;
import com.pikolive.core.decoration.headwear.bean.HeadWearInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.noble.NobleResourceType;
import com.pikolive.core.noble.NobleUtil;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.giftvalue.bean.GiftValueData;
import com.pikolive.core.room.giftvalue.helper.GiftValueFormat;
import com.pikolive.core.room.pk.bean.PKTeamInfo;
import com.pikolive.core.room.queue.bean.MicMemberInfo;
import com.pikolive.core.user.UserModel;
import com.pikolive.core.utils.ActivityUtil;
import com.pikolive.core.utils.StringExtensionKt;
import com.pikolive.library.utils.ResUtil;
import com.pikolive.library.utils.config.BasicConfig;

2
app/src/main/java/com/pikolive/app/avroom/adapter/CpMicroViewAdapter.java
View File

@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.pikolive.core.bean.RoomQueueInfo;
import com.pikolive.library.utils.ResUtil;
public class CpMicroViewAdapter extends BaseMicroViewAdapter {

2
app/src/main/java/com/pikolive/app/avroom/adapter/CreateRoomGameAdapter.kt
View File

@@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.pikolive.app.ui.utils.load
import com.yizhuan.erban.R
import com.yizhuan.xchat_android_core.room.game.GameInfo
import com.pikolive.core.room.game.GameInfo
class CreateRoomGameAdapter :
BaseQuickAdapter<GameInfo, BaseViewHolder>(R.layout.item_room_create_game) {

2
app/src/main/java/com/pikolive/app/avroom/adapter/CreateRoomGameGuideAdapter.kt
View File

@@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.pikolive.library.common.glide.GlideUtils
import com.pikolive.app.ui.utils.ImageLoadUtilsV2
import com.yizhuan.xchat_android_core.room.game.GameInfo
import com.pikolive.core.room.game.GameInfo
class CreateRoomGameGuideAdapter :
BaseQuickAdapter<GameInfo, BaseViewHolder>(R.layout.item_room_create_game_guide) {

8
app/src/main/java/com/pikolive/app/avroom/adapter/DatingMicroViewAdapter.kt
View File

@@ -15,10 +15,10 @@ import androidx.recyclerview.widget.RecyclerView
import com.pikolive.app.ui.utils.load
import com.yizhuan.erban.R
import com.pikolive.app.utils.UserUtils
import com.yizhuan.xchat_android_core.Constants
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.bean.RoomInfo
import com.pikolive.core.Constants
import com.pikolive.core.bean.RoomQueueInfo
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.room.bean.RoomInfo
import com.pikolive.library.utils.ResUtil

4
app/src/main/java/com/pikolive/app/avroom/adapter/ExitRoomAdapter.kt
View File

@@ -4,8 +4,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.pikolive.app.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.pikolive.core.utils.subAndReplaceDot
import com.pikolive.core2.home.bean.HomeRoomInfo
class ExitRoomAdapter :
BaseQuickAdapter<HomeRoomInfo, BaseViewHolder>(R.layout.item_exit_room) {

4
app/src/main/java/com/pikolive/app/avroom/adapter/GameMicroViewAdapter.kt
View File

@@ -12,8 +12,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.netease.nim.uikit.common.util.sys.ScreenUtil
import com.yizhuan.erban.R
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.pikolive.core.bean.RoomQueueInfo
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.library.utils.ResUtil

4
app/src/main/java/com/pikolive/app/avroom/adapter/GameMiniMicroViewAdapter.kt
View File

@@ -8,8 +8,8 @@ import android.view.ViewGroup
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.yizhuan.erban.R
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.pikolive.core.bean.RoomQueueInfo
import com.pikolive.core.manager.AvRoomDataManager
/**

4
app/src/main/java/com/pikolive/app/avroom/adapter/InviteFriendListAdapter.java
View File

@@ -14,8 +14,8 @@ import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallFriendInfo;
import com.yizhuan.erban.public_chat_hall.event.AitFriendEvent;
import com.pikolive.app.ui.utils.ImageLoadUtils;
import com.pikolive.app.ui.widget.NobleAvatarView;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.pikolive.core.noble.NobleUtil;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.library.utils.ResUtil;
import com.pikolive.library.utils.SingleToastUtil;

8
app/src/main/java/com/pikolive/app/avroom/adapter/MicQueueAdapter.java
View File

@@ -10,10 +10,10 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.pikolive.app.common.widget.CircleImageView;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.queuing_mic.bean.GroupType;
import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicMemeberInfo;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.queuing_mic.bean.GroupType;
import com.pikolive.core.room.queuing_mic.bean.QueuingMicMemeberInfo;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.library.utils.ResUtil;
import java.util.List;

4
app/src/main/java/com/pikolive/app/avroom/adapter/MicroViewAdapter.java
View File

@@ -12,8 +12,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.pikolive.core.bean.RoomQueueInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.library.utils.ResUtil;
/**

2
app/src/main/java/com/pikolive/app/avroom/adapter/OnMicroItemClickListener.java
View File

@@ -1,6 +1,6 @@
package com.pikolive.app.avroom.adapter;
import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
import com.pikolive.core.room.queue.bean.MicMemberInfo;
/**
* Created by lvzebiao on 2018/11/5.

18
app/src/main/java/com/pikolive/app/avroom/adapter/OnlineUserAdapter.java
View File

@@ -20,15 +20,15 @@ import com.yizhuan.erban.R;
import com.pikolive.app.ui.utils.ImageLoadUtils;
import com.pikolive.app.ui.widget.NobleAvatarView;
import com.pikolive.app.utils.RegexUtil;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.level.UserLevelResourceType;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.noble.NobleResourceType;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.level.UserLevelResourceType;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core2.manager.IMNetEaseManager;
import com.pikolive.core.manager.RoomEvent;
import com.pikolive.core.noble.NobleResourceType;
import com.pikolive.core.noble.NobleUtil;
import com.pikolive.core.room.bean.OnlineChatMember;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.library.utils.ListUtils;
import java.util.List;

8
app/src/main/java/com/pikolive/app/avroom/adapter/PKMicQueueAdapter.java
View File

@@ -10,10 +10,10 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.pikolive.app.common.widget.CircleImageView;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.pk.bean.PKQueuingMicMemberInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.pk.bean.PKQueuingMicMemberInfo;
import com.pikolive.core.room.pk.bean.PKTeamInfo;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.library.utils.ResUtil;
import java.util.List;

8
app/src/main/java/com/pikolive/app/avroom/adapter/RecordForPKAdapter.java
View File

@@ -11,10 +11,10 @@ import androidx.annotation.Nullable;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamMember;
import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData;
import com.pikolive.core.room.pk.bean.PKRecordInfo;
import com.pikolive.core.room.pk.bean.PKTeamInfo;
import com.pikolive.core.room.pk.bean.PKTeamMember;
import com.pikolive.core.room.pk.bean.RoomPkData;
import com.pikolive.library.utils.FormatUtils;
import com.pikolive.library.utils.ResUtil;

8
app/src/main/java/com/pikolive/app/avroom/adapter/RoomConsumeListAdapter.java
View File

@@ -17,10 +17,10 @@ import com.pikolive.app.ui.utils.ImageLoadUtils;
import com.pikolive.app.ui.widget.NobleAvatarView;
import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil;
import com.pikolive.app.utils.RegexUtil;
import com.yizhuan.xchat_android_core.noble.NobleInfo;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem;
import com.pikolive.core.noble.NobleInfo;
import com.pikolive.core.noble.NobleUtil;
import com.pikolive.core.room.bean.RoomContributeUserInfo;
import com.pikolive.core.room.bean.RoomRankMultiItem;
import com.pikolive.library.utils.ResUtil;
import java.math.BigDecimal;

4
app/src/main/java/com/pikolive/app/avroom/adapter/RoomConsumerListAdapterTemp.java
View File

@@ -15,8 +15,8 @@ import com.yizhuan.erban.R;
import com.pikolive.app.common.widget.CircleImageView;
import com.pikolive.app.ui.utils.ImageLoadUtils;
import com.pikolive.app.utils.RegexUtil;
import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem;
import com.pikolive.core.room.bean.RoomContributeUserInfo;
import com.pikolive.core.room.bean.RoomRankMultiItem;
import java.util.ArrayList;

6
app/src/main/java/com/pikolive/app/avroom/adapter/RoomInviteAdapter.java
View File

@@ -18,9 +18,9 @@ import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
import com.pikolive.app.avroom.ChatMemberDiffUtilCallback;
import com.yizhuan.erban.R;
import com.pikolive.app.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core2.manager.IMNetEaseManager;
import com.pikolive.core.manager.RoomEvent;
import com.pikolive.library.utils.ListUtils;
import java.util.ArrayList;

4
app/src/main/java/com/pikolive/app/avroom/adapter/RoomRankHalfHourListAdapter.java
View File

@@ -9,8 +9,8 @@ import com.pikolive.app.avroom.fragment.RoomRankDialogUtils;
import com.yizhuan.erban.R;
import com.pikolive.app.common.widget.CircleImageView;
import com.pikolive.app.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourRankInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem;
import com.pikolive.core.room.bean.RoomRankHalfHourRankInfo;
import com.pikolive.core.room.bean.RoomRankMultiItem;
import java.util.ArrayList;

2
app/src/main/java/com/pikolive/app/avroom/adapter/SelectGameAdapter.kt
View File

@@ -3,7 +3,7 @@ package com.pikolive.app.avroom.adapter
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.xchat_android_core.room.game.GameInfo
import com.pikolive.core.room.game.GameInfo
class SelectGameAdapter :
BaseQuickAdapter<GameInfo, BaseViewHolder>(R.layout.item_room_select_game) {

2
app/src/main/java/com/pikolive/app/avroom/adapter/SingleAnchorMicroViewAdapter.kt
View File

@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.opensource.svgaplayer.SVGAImageView
import com.yizhuan.erban.R
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo
import com.pikolive.core.bean.RoomQueueInfo
/**
* @author xiaoyu

8
app/src/main/java/com/pikolive/app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt
View File

@@ -13,10 +13,10 @@ import androidx.recyclerview.widget.RecyclerView
import com.yizhuan.erban.R
import com.pikolive.app.common.widget.CircleImageView
import com.pikolive.app.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.praise.PraiseModel
import com.yizhuan.xchat_android_core.utils.toast
import com.pikolive.core.bean.RoomQueueInfo
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.praise.PraiseModel
import com.pikolive.core.utils.toast
import com.pikolive.library.utils.ResUtil
import com.pikolive.library.utils.config.BasicConfig

6
app/src/main/java/com/pikolive/app/avroom/adapter/UpMicAdapter.java
View File

@@ -8,9 +8,9 @@ import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.pikolive.core.Constants;
import com.pikolive.core.bean.RoomQueueInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.library.utils.ResUtil;
import java.util.ArrayList;

24
app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKBoardView.kt
View File

@@ -20,12 +20,12 @@ import com.yizhuan.erban.R
import com.pikolive.app.common.widget.DragLayout
import com.yizhuan.erban.databinding.LayoutRoomPkBoardViewBinding
import com.pikolive.app.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.ShowGiftDialogEvent
import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.pikolive.core.im.custom.bean.RoomPkBean
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.room.anotherroompk.ShowGiftDialogEvent
import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent
import com.pikolive.core.utils.CurrentTimeUtils
import com.pikolive.core.utils.subAndReplaceDot
import com.pikolive.library.rxbus.RxBus
import com.pikolive.library.utils.CommonUtils
import io.reactivex.Observable
@@ -71,13 +71,21 @@ class RoomPKBoardView @JvmOverloads constructor(
binding.ivAvatarLeft.setOnClickListener {
roomPkBean?.let {
RxBus.get().post(ShowUserInfoDialogEvent(it.cUid.toString()))
RxBus.get().post(
ShowUserInfoDialogEvent(
it.cUid.toString()
)
)
}
}
binding.ivAvatarRight.setOnClickListener {
roomPkBean?.let {
RxBus.get().post(ShowUserInfoDialogEvent(it.aUid.toString()))
RxBus.get().post(
ShowUserInfoDialogEvent(
it.aUid.toString()
)
)
}
}

16
app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKCreateActivity.kt
View File

@@ -12,14 +12,14 @@ import com.pikolive.app.base.BaseViewBindingActivity
import com.yizhuan.erban.databinding.ActivityRoomPkCreateBinding
import com.pikolive.app.ui.utils.ImageLoadUtils
import com.pikolive.app.ui.widget.TextWatcherSimple
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel
import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo
import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.toIntOrDef
import com.yizhuan.xchat_android_core.utils.toast
import com.pikolive.core.auth.AuthModel
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.room.anotherroompk.RoomPKModel
import com.pikolive.core.room.anotherroompk.SimpleRoomInfo
import com.pikolive.core.utils.ifNotNullOrEmpty
import com.pikolive.core.utils.subAndReplaceDot
import com.pikolive.core.utils.toIntOrDef
import com.pikolive.core.utils.toast
import com.pikolive.library.utils.ResUtil
class RoomPKCreateActivity : BaseViewBindingActivity<ActivityRoomPkCreateBinding>() {

10
app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKRankListView.kt
View File

@@ -8,8 +8,8 @@ import androidx.core.view.isGone
import com.yizhuan.erban.R
import com.yizhuan.erban.databinding.LayoutRoomPkRankListViewBinding
import com.pikolive.app.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent
import com.pikolive.core.im.custom.bean.RoomPkBean
import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent
import com.pikolive.library.rxbus.RxBus
class RoomPKRankListView @JvmOverloads constructor(
@@ -26,7 +26,11 @@ class RoomPKRankListView @JvmOverloads constructor(
ivAvatars.forEach { ivAvatar ->
ivAvatar.setOnClickListener {
ivAvatar.tag?.toString()?.let {
RxBus.get().post(ShowUserInfoDialogEvent(it))
RxBus.get().post(
ShowUserInfoDialogEvent(
it
)
)
}
}
}

8
app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKSearchActivity.kt
View File

@@ -13,10 +13,10 @@ import com.pikolive.app.common.EmptyViewHelper
import com.yizhuan.erban.databinding.ActivityRoomPkSearchBinding
import com.pikolive.app.ui.user.activity.UserInfoActivity
import com.pikolive.app.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel
import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo
import com.yizhuan.xchat_android_core.utils.toast
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.room.anotherroompk.RoomPKModel
import com.pikolive.core.room.anotherroompk.SimpleRoomInfo
import com.pikolive.core.utils.toast
import com.pikolive.library.utils.ResUtil
class RoomPKSearchActivity : BaseViewBindingActivity<ActivityRoomPkSearchBinding>() {

4
app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKSearchAdapter.kt
View File

@@ -4,8 +4,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.pikolive.app.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.pikolive.core.room.anotherroompk.SimpleRoomInfo
import com.pikolive.core.utils.subAndReplaceDot
class RoomPKSearchAdapter :
BaseQuickAdapter<SimpleRoomInfo, BaseViewHolder>(R.layout.item_room_pk_search) {

4
app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkFinishDialog.kt
View File

@@ -8,8 +8,8 @@ import com.yizhuan.erban.R
import com.pikolive.app.base.BaseDialog
import com.yizhuan.erban.databinding.DialogRoomPkFinishBinding
import com.pikolive.app.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.pikolive.core.im.custom.bean.RoomPkBean
import com.pikolive.core.utils.subAndReplaceDot
class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {

4
app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt
View File

@@ -7,8 +7,8 @@ import com.yizhuan.erban.R
import com.pikolive.app.base.BaseDialog
import com.yizhuan.erban.databinding.DialogRoomPkForceFinishBinding
import com.pikolive.app.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.pikolive.core.im.custom.bean.RoomPkBean
import com.pikolive.core.utils.subAndReplaceDot
class RoomPkForceFinishDialog : BaseDialog<DialogRoomPkForceFinishBinding>() {

12
app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkReceivedDialog.kt
View File

@@ -5,12 +5,12 @@ import android.os.Bundle
import androidx.core.view.isVisible
import com.pikolive.app.base.BaseDialog
import com.yizhuan.erban.databinding.DialogRoomPkReceivedBinding
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel
import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.toast
import com.pikolive.core.im.custom.bean.RoomPkBean
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.room.anotherroompk.RoomPKModel
import com.pikolive.core.utils.ifNotNullOrEmpty
import com.pikolive.core.utils.subAndReplaceDot
import com.pikolive.core.utils.toast
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable

4
app/src/main/java/com/pikolive/app/avroom/core/AudioRoomContext.kt
View File

@@ -1,8 +1,8 @@
package com.pikolive.app.avroom.core
import com.pikolive.app.avroom.redpackage.RedPackageHandler
import com.yizhuan.xchat_android_core.support.room.RoomAbility
import com.yizhuan.xchat_android_core.support.room.RoomContext
import com.pikolive.core.support.room.RoomAbility
import com.pikolive.core.support.room.RoomContext
/**
* Created by Max on 2023/10/26 15:41

4
app/src/main/java/com/pikolive/app/avroom/dialog/AttentionHintDialog.java
View File

@@ -7,8 +7,8 @@ import android.widget.TextView;
import com.yizhuan.erban.R;
import com.pikolive.app.base.BaseBsDialog;
import com.pikolive.app.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.praise.PraiseModel;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.praise.PraiseModel;
import com.pikolive.library.utils.ResUtil;
import com.pikolive.library.utils.SingleToastUtil;

6
app/src/main/java/com/pikolive/app/avroom/dialog/CreateGameRoomDialog.kt
View File

@@ -9,9 +9,9 @@ import com.pikolive.app.base.BaseDialog
import com.yizhuan.erban.databinding.DialogCreateGameRoomBinding
import com.pikolive.app.home.helper.OpenRoomHelper
import com.pikolive.app.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.room.bean.RoomInfo
import com.yizhuan.xchat_android_core.room.game.GameInfo
import com.yizhuan.xchat_android_core.room.game.GameModel
import com.pikolive.core.room.bean.RoomInfo
import com.pikolive.core.room.game.GameInfo
import com.pikolive.core.room.game.GameModel
class CreateGameRoomDialog : BaseDialog<DialogCreateGameRoomBinding>() {

8
app/src/main/java/com/pikolive/app/avroom/dialog/CreateRoomDialog.kt
View File

@@ -12,10 +12,10 @@ import com.pikolive.app.base.BaseDialog
import com.yizhuan.erban.databinding.DialogCreateRoomBinding
import com.pikolive.app.home.helper.OpenRoomHelper
import com.pikolive.app.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.room.bean.RoomInfo
import com.yizhuan.xchat_android_core.room.game.GameInfo
import com.yizhuan.xchat_android_core.room.game.GameModel
import com.yizhuan.xchat_android_core.utils.toast
import com.pikolive.core.room.bean.RoomInfo
import com.pikolive.core.room.game.GameInfo
import com.pikolive.core.room.game.GameModel
import com.pikolive.core.utils.toast
import com.pikolive.library.utils.ResUtil
class CreateRoomDialog : BaseDialog<DialogCreateRoomBinding>() {

6
app/src/main/java/com/pikolive/app/avroom/dialog/ExitRoomPopupWindow.kt
View File

@@ -18,9 +18,9 @@ import com.yizhuan.erban.R
import com.pikolive.app.common.widget.dialog.DialogManager.LambdaOkDialogListener
import com.pikolive.app.common.widget.dialog.DialogManager.OkCancelDialogListener
import com.pikolive.app.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.model.AvRoomModel
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.room.model.AvRoomModel
import com.pikolive.core2.home.bean.HomeRoomInfo
import com.pikolive.library.annatation.ActLayoutRes
import com.pikolive.library.utils.ResUtil
import io.reactivex.disposables.Disposable

26
app/src/main/java/com/pikolive/app/avroom/dialog/MicQueueDialog.java
View File

@@ -27,19 +27,19 @@ import com.pikolive.app.common.util.Utils;
import com.pikolive.app.home.helper.LoadPageDataHelper;
import com.pikolive.app.ui.widget.dialog.BaseDialog;
import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg;
import com.yizhuan.xchat_android_core.room.model.HomePartyModel;
import com.yizhuan.xchat_android_core.room.model.MicQueueModel;
import com.yizhuan.xchat_android_core.room.queuing_mic.bean.GroupType;
import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicMemeberInfo;
import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RespQueuingMicListInfo;
import com.yizhuan.xchat_android_core.user.bean.BaseInfo;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.pikolive.core.Constants;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.bean.RoomQueueInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.giftvalue.helper.GiftValueMrg;
import com.pikolive.core.room.model.HomePartyModel;
import com.pikolive.core.room.model.MicQueueModel;
import com.pikolive.core.room.queuing_mic.bean.GroupType;
import com.pikolive.core.room.queuing_mic.bean.QueuingMicMemeberInfo;
import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo;
import com.pikolive.core.user.bean.BaseInfo;
import com.pikolive.core.utils.net.BeanObserver;
import com.pikolive.library.net.rxnet.callback.CallBack;
import com.pikolive.library.utils.CommonUtils;
import com.pikolive.library.utils.JavaUtil;

2
app/src/main/java/com/pikolive/app/avroom/dialog/NewUserGiftDialog.kt
View File

@@ -3,7 +3,7 @@ package com.pikolive.app.avroom.dialog
import com.pikolive.app.base.BaseDialog
import com.pikolive.app.ui.utils.load
import com.yizhuan.erban.databinding.DialogNewUserGiftBinding
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo
import com.pikolive.core.gift.bean.GiftInfo
class NewUserGiftDialog(val giftInfo: GiftInfo) :
BaseDialog<DialogNewUserGiftBinding>() {

24
app/src/main/java/com/pikolive/app/avroom/dialog/PKMicQueueDialog.java
View File

@@ -27,18 +27,18 @@ import com.pikolive.app.ui.widget.dialog.BaseDialog;
import com.pikolive.app.ui.widget.dialog.CommonLoadingDialog;
import com.pikolive.app.common.util.Utils;
import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKQueuingMicMemberInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKRespQueuingMicListInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember;
import com.yizhuan.xchat_android_core.room.pk.model.PkModel;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.pikolive.core.Constants;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.bean.RoomQueueInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.pk.bean.PKMemberInfo;
import com.pikolive.core.room.pk.bean.PKQueuingMicMemberInfo;
import com.pikolive.core.room.pk.bean.PKRespQueuingMicListInfo;
import com.pikolive.core.room.pk.bean.PKTeamInfo;
import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember;
import com.pikolive.core.room.pk.model.PkModel;
import com.pikolive.core.utils.net.BeanObserver;
import com.pikolive.library.utils.JavaUtil;
import com.pikolive.library.utils.ListUtils;
import com.pikolive.library.utils.ResUtil;

8
app/src/main/java/com/pikolive/app/avroom/dialog/PKResultDialog.java
View File

@@ -23,10 +23,10 @@ import com.pikolive.app.common.widget.CircleImageView;
import com.pikolive.app.ui.widget.dialog.BaseDialog;
import com.pikolive.app.common.util.Utils;
import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamMember;
import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.room.pk.bean.PKTeamInfo;
import com.pikolive.core.room.pk.bean.PKTeamMember;
import com.pikolive.core.room.pk.bean.RoomPkData;
import com.pikolive.library.utils.FormatUtils;
import com.pikolive.library.utils.ResUtil;

24
app/src/main/java/com/pikolive/app/avroom/dialog/PKScoreBoardDialog.java
View File

@@ -11,18 +11,18 @@ import com.yizhuan.erban.R;
import com.pikolive.app.common.widget.CircleImageView;
import com.pikolive.app.ui.widget.dialog.BaseDialog;
import com.pikolive.app.ui.widget.dialog.CommonTipDialog;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamMember;
import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData;
import com.yizhuan.xchat_android_core.room.pk.event.PKDataUpdateEvent;
import com.yizhuan.xchat_android_core.room.pk.event.PKTimeFinishEvent;
import com.yizhuan.xchat_android_core.room.pk.event.PKTimeTickEvent;
import com.yizhuan.xchat_android_core.room.pk.model.PkModel;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core2.manager.IMNetEaseManager;
import com.pikolive.core.manager.RoomEvent;
import com.pikolive.core.room.pk.bean.PKMemberInfo;
import com.pikolive.core.room.pk.bean.PKTeamInfo;
import com.pikolive.core.room.pk.bean.PKTeamMember;
import com.pikolive.core.room.pk.bean.RoomPkData;
import com.pikolive.core.room.pk.event.PKDataUpdateEvent;
import com.pikolive.core.room.pk.event.PKTimeFinishEvent;
import com.pikolive.core.room.pk.event.PKTimeTickEvent;
import com.pikolive.core.room.pk.model.PkModel;
import com.pikolive.core.admin.util.SuperAdminUtil;
import com.pikolive.library.utils.FormatUtils;
import com.pikolive.library.utils.ResUtil;

10
app/src/main/java/com/pikolive/app/avroom/dialog/PKSelectPeopleDialog.java
View File

@@ -19,11 +19,11 @@ import com.yizhuan.erban.R;
import com.pikolive.app.common.widget.CircleImageView;
import com.pikolive.app.ui.widget.dialog.BaseDialog;
import com.pikolive.app.common.util.Utils;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo;
import com.yizhuan.xchat_android_core.room.pk.model.PkModel;
import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
import com.pikolive.core.bean.RoomQueueInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.pk.bean.PKMemberInfo;
import com.pikolive.core.room.pk.model.PkModel;
import com.pikolive.core.room.queue.bean.MicMemberInfo;
import com.pikolive.library.utils.ResUtil;
import java.util.ArrayList;

11
app/src/main/java/com/pikolive/app/avroom/dialog/RequestUpMicDialog.kt
View File

@@ -2,13 +2,13 @@ package com.pikolive.app.avroom.dialog
import android.content.Context
import android.view.View
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.user.bean.BaseInfo
import com.pikolive.core.user.bean.UserInfo
import com.pikolive.core2.manager.IMNetEaseManager
import com.yizhuan.erban.R
import com.yizhuan.erban.databinding.DialogRequestUpmicBinding
import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager
import com.yizhuan.xchat_android_core.user.bean.BaseInfo
import com.yizhuan.xchat_android_core.user.bean.UserInfo
import com.pikolive.library.annatation.ActLayoutRes
@ActLayoutRes(R.layout.dialog_request_upmic)
@@ -27,7 +27,8 @@ class RequestUpMicDialog(context: Context) :
}
R.id.btn_ok -> {
userInfo?.let {
val baseInfo = BaseInfo(it.uid, it.nick)
val baseInfo =
BaseInfo(it.uid, it.nick)
val position = AvRoomDataManager.get().findFreePosition()
if ( position == Int.MIN_VALUE) return@let
IMNetEaseManager.get().inviteMicroPhoneBySdk(baseInfo, position ).subscribe()

2
app/src/main/java/com/pikolive/app/avroom/dialog/RoomFreeGiftDialog.java
View File

@@ -13,7 +13,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.yizhuan.erban.R;
import com.yizhuan.erban.databinding.DialogRoomFreeGiftBinding;
import com.pikolive.app.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.xchat_android_core.gift.bean.GiftFreeInfo;
import com.pikolive.core.gift.bean.GiftFreeInfo;
import com.pikolive.library.utils.TimeUtils;
/**

10
app/src/main/java/com/pikolive/app/avroom/dialog/RoomImposeDialog.java
View File

@@ -20,11 +20,11 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.databinding.DialogRoomImposeBinding;
import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil;
import com.pikolive.app.common.util.Utils;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.RoomSettingModel;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.model.RoomSettingModel;
import com.pikolive.core.utils.net.DontWarnObserver;
import com.pikolive.library.utils.ResUtil;
import com.pikolive.library.utils.SingleToastUtil;
import com.pikolive.library.utils.codec.DESUtils;

42
app/src/main/java/com/pikolive/app/avroom/dialog/RoomOperationDialog.java
View File

@@ -33,27 +33,27 @@ import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration;
import com.pikolive.app.ui.widget.recyclerview.layoutmanager.FullyGridLayoutManager;
import com.pikolive.app.vip.dialog.VipBroadcastDialog;
import com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.redpackage.RedPackageModel;
import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.event.RoomExitEvent;
import com.yizhuan.xchat_android_core.room.event.RoomShieldEvent;
import com.yizhuan.xchat_android_core.room.giftvalue.GiftValueModel;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.room.model.HomePartyModel;
import com.yizhuan.xchat_android_core.room.queuing_mic.event.HasAnimationEffect;
import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.pikolive.core2.XChatConstants;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core.im.custom.bean.RoomPkBean;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core2.manager.IMNetEaseManager;
import com.pikolive.core.redpackage.RedPackageModel;
import com.pikolive.core.room.anotherroompk.SingleRoomPKModel;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.event.RoomExitEvent;
import com.pikolive.core.room.event.RoomShieldEvent;
import com.pikolive.core.room.giftvalue.GiftValueModel;
import com.pikolive.core.room.model.AvRoomModel;
import com.pikolive.core.room.model.HomePartyModel;
import com.pikolive.core.room.queuing_mic.event.HasAnimationEffect;
import com.pikolive.core.admin.model.SuperAdminModel;
import com.pikolive.core.admin.util.SuperAdminUtil;
import com.pikolive.core.user.UserModel;
import com.pikolive.core.utils.CurrentTimeUtils;
import com.pikolive.core.utils.net.BeanObserver;
import com.pikolive.core.utils.net.DontWarnObserver;
import com.pikolive.core.utils.net.RxHelper;
import com.pikolive.library.utils.ResUtil;
import com.pikolive.library.utils.SingleToastUtil;

8
app/src/main/java/com/pikolive/app/avroom/dialog/SendBroadcastDialog.kt
View File

@@ -13,10 +13,10 @@ import com.pikolive.app.base.BaseDialog
import com.yizhuan.erban.databinding.DialogSendBroadcastBinding
import com.pikolive.app.ui.utils.RVDelegate
import com.pikolive.app.utils.SpannableBuilder
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.bean.BroadcastInfo
import com.yizhuan.xchat_android_core.room.model.AvRoomModel
import com.yizhuan.xchat_android_core.utils.toast
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.room.bean.BroadcastInfo
import com.pikolive.core.room.model.AvRoomModel
import com.pikolive.core.utils.toast
import com.pikolive.library.utils.CommonUtils
import com.pikolive.library.utils.TextWatcherWrapper
import io.reactivex.Observable

22
app/src/main/java/com/pikolive/app/avroom/firstcharge/FirstChargeDialog.kt
View File

@@ -31,17 +31,17 @@ import com.pikolive.app.ui.pay.BillingManager
import com.pikolive.app.ui.setting.ModifyPwdActivity
import com.pikolive.app.ui.webview.CommonWebViewActivity
import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil
import com.yizhuan.xchat_android_core.Constants
import com.yizhuan.xchat_android_core.DemoCache
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.pay.PayModel
import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods
import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward
import com.yizhuan.xchat_android_core.pay.bean.PayRecordId
import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent
import com.yizhuan.xchat_android_core.room.model.AvRoomModel
import com.yizhuan.xchat_android_core.utils.net.IgnoreException
import com.yizhuan.xchat_android_core.utils.toast
import com.pikolive.core.Constants
import com.pikolive.core.DemoCache
import com.pikolive.core.pay.PayModel
import com.pikolive.core.pay.bean.FirstChargeGoods
import com.pikolive.core.pay.bean.FirstChargeReward
import com.pikolive.core.pay.bean.PayRecordId
import com.pikolive.core.pay.event.FirstChargeEvent
import com.pikolive.core.room.model.AvRoomModel
import com.pikolive.core.utils.net.IgnoreException
import com.pikolive.core.utils.toast
import com.pikolive.core2.UriProvider
import com.pikolive.library.common.util.DeviceUtil
import com.pikolive.library.utils.AppMetaDataUtil
import com.pikolive.library.utils.ResUtil

2
app/src/main/java/com/pikolive/app/avroom/firstcharge/FirstChargePrizeDialog.kt
View File

@@ -9,7 +9,7 @@ import com.yizhuan.erban.R
import com.yizhuan.erban.databinding.DialogFirstChargePrizeBinding
import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog
import com.pikolive.app.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward
import com.pikolive.core.pay.bean.FirstChargeReward
import com.pikolive.library.annatation.ActLayoutRes
@ActLayoutRes(R.layout.dialog_first_charge_prize)

4
app/src/main/java/com/pikolive/app/avroom/firstcharge/Reward2Adapter.kt
View File

@@ -4,8 +4,8 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.pikolive.app.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward
import com.yizhuan.xchat_android_core.utils.TextUtils
import com.pikolive.core.pay.bean.FirstChargeReward
import com.pikolive.core.utils.TextUtils
class Reward2Adapter : BaseMultiItemQuickAdapter<FirstChargeReward, BaseViewHolder>(null) {

4
app/src/main/java/com/pikolive/app/avroom/firstcharge/RewardAdapter.kt
View File

@@ -7,8 +7,8 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.netease.nim.uikit.common.util.sys.ScreenUtil
import com.yizhuan.erban.R
import com.pikolive.app.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward
import com.yizhuan.xchat_android_core.utils.TextUtils
import com.pikolive.core.pay.bean.FirstChargeReward
import com.pikolive.core.utils.TextUtils
class RewardAdapter(private val itemWidth: Int) :
BaseQuickAdapter<FirstChargeReward, BaseViewHolder>(R.layout.item_first_charge_reward) {

101
app/src/main/java/com/pikolive/app/avroom/fragment/BaseRoomFragment.kt
View File

@@ -61,47 +61,47 @@ import com.pikolive.app.ui.widget.rollviewpager.RollPagerView
import com.pikolive.app.ui.widget.rollviewpager.Util
import com.pikolive.app.ui.widget.rollviewpager.hintview.ColorPointHintView
import com.pikolive.app.utils.KeyBoardUtils
import com.pikolive.core.Constants
import com.pikolive.core.DemoCache
import com.pikolive.core.admin.SaConstant
import com.pikolive.core.admin.model.SuperAdminModel
import com.pikolive.core.admin.util.SuperAdminUtil
import com.pikolive.core.auth.AuthModel
import com.pikolive.core.bean.RoomMicInfo
import com.pikolive.core.gift.GiftModel
import com.pikolive.core.gift.bean.GiftInfo
import com.pikolive.core.gift.event.RoomFreeGiftEvent
import com.pikolive.core.im.custom.bean.RoomFollowOwnerAttachment
import com.pikolive.core.im.custom.bean.RoomFollowOwnerAttachment2
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.manager.RoomEvent
import com.yizhuan.tutu.music.widget.MusicPlayerView
import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity
import com.yizhuan.xchat_android_constants.XChatConstants
import com.yizhuan.xchat_android_core.Constants
import com.yizhuan.xchat_android_core.DemoCache
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.bean.RoomMicInfo
import com.yizhuan.xchat_android_core.gift.GiftModel
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo
import com.yizhuan.xchat_android_core.gift.event.RoomFreeGiftEvent
import com.yizhuan.xchat_android_core.helper.AtProxy
import com.yizhuan.xchat_android_core.home.bean.BannerInfo
import com.yizhuan.xchat_android_core.home.event.OpenRoomMessageInputEvent
import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment
import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment2
import com.yizhuan.xchat_android_core.manager.AudioEngineManager
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager
import com.yizhuan.xchat_android_core.manager.RoomEvent
import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringStopCountingEvent
import com.yizhuan.xchat_android_core.room.anotherroompk.ShowGiftDialogEvent
import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent
import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo
import com.yizhuan.xchat_android_core.room.bean.RoomInfo
import com.yizhuan.xchat_android_core.room.event.RoomAtEvent
import com.yizhuan.xchat_android_core.room.event.RoomClearScreenEvent
import com.yizhuan.xchat_android_core.room.game.GameStatus
import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg
import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo
import com.yizhuan.xchat_android_core.share.bean.SessionType
import com.yizhuan.xchat_android_core.super_admin.SaConstant
import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil
import com.yizhuan.xchat_android_core.support.room.RoomView
import com.yizhuan.xchat_android_core.support.room.RoomWidget
import com.yizhuan.xchat_android_core.user.UserModel
import com.yizhuan.xchat_android_core.user.bean.BaseInfo
import com.yizhuan.xchat_android_core.user.bean.UserInfo
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
import com.yizhuan.xchat_android_core.utils.net.VipLevelNotEnoughException
import com.pikolive.core2.XChatConstants
import com.pikolive.core2.home.event.OpenRoomMessageInputEvent
import com.pikolive.core.mentoring_relationship.event.MentoringStopCountingEvent
import com.pikolive.core.room.anotherroompk.ShowGiftDialogEvent
import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent
import com.pikolive.core.room.bean.RoomContributeUserInfo
import com.pikolive.core.room.bean.RoomInfo
import com.pikolive.core.room.event.RoomAtEvent
import com.pikolive.core.room.event.RoomClearScreenEvent
import com.pikolive.core.room.game.GameStatus
import com.pikolive.core.room.giftvalue.helper.GiftValueMrg
import com.pikolive.core.room.queue.bean.MicMemberInfo
import com.pikolive.core.share.bean.SessionType
import com.pikolive.core.support.room.RoomView
import com.pikolive.core.support.room.RoomWidget
import com.pikolive.core.user.UserModel
import com.pikolive.core.user.bean.BaseInfo
import com.pikolive.core.user.bean.UserInfo
import com.pikolive.core.utils.CurrentTimeUtils
import com.pikolive.core.utils.net.VipLevelNotEnoughException
import com.pikolive.core2.UriProvider
import com.pikolive.core2.helper.AtProxy
import com.pikolive.core2.home.bean.BannerInfo
import com.pikolive.core2.manager.AudioEngineManager
import com.pikolive.core2.manager.IMNetEaseManager
import com.pikolive.library.common.util.LimitClickUtils
import com.pikolive.library.common.util.SPUtils
import com.pikolive.library.net.rxnet.utils.RxNetWorkUtils
@@ -232,7 +232,8 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : com.pikolive.app.avroom.pres
messageView.setOnLongClickListener { _, account, name ->
showInputLayout()
if (atProxy == null) atProxy = AtProxy(inputEdit)
if (atProxy == null) atProxy =
AtProxy(inputEdit)
atProxy?.insertAitMember(account, name)
}
softKeyboardListener()
@@ -924,7 +925,8 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : com.pikolive.app.avroom.pres
override fun onUpMicBtnClick(position: Int, chatRoomMember: MicMemberInfo?) {
if (AvRoomDataManager.get().isDatingVipMic(position) &&
!AvRoomDataManager.get().isDatingVip(AuthModel.get().currentUid)
!AvRoomDataManager.get().isDatingVip(
AuthModel.get().currentUid)
) {
com.pikolive.app.avroom.dialog.DatingVipRuleDialog.newInstance(mContext).show()
} else {
@@ -961,7 +963,7 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : com.pikolive.app.avroom.pres
com.pikolive.app.avroom.activity.RoomTitleEditActivity.startForResult(activity, info.roomDesc, info.introduction)
} else {
val dialogFragment =
com.pikolive.app.avroom.fragment.RoomTitleDialogFragment.getInstance(info.roomDesc, info.introduction)
RoomTitleDialogFragment.getInstance(info.roomDesc, info.introduction)
dialogFragment.show(requireActivity().supportFragmentManager, "roomTitle")
}
}
@@ -1078,7 +1080,8 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : com.pikolive.app.avroom.pres
if (roomInfo == null || userInfo == null) {
return@post
}
val roomFollowOwnerAttachment = RoomFollowOwnerAttachment()
val roomFollowOwnerAttachment =
RoomFollowOwnerAttachment()
roomFollowOwnerAttachment.ownerUid = AvRoomDataManager.get().roomUid
roomFollowOwnerAttachment.userInfo = userInfo
AvRoomDataManager.get().addChatRoomMessage(
@@ -1104,7 +1107,8 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : com.pikolive.app.avroom.pres
if (roomInfo == null || userInfo == null) {
return@post
}
val roomFollowOwnerAttachment = RoomFollowOwnerAttachment2()
val roomFollowOwnerAttachment =
RoomFollowOwnerAttachment2()
roomFollowOwnerAttachment.ownerUid = AvRoomDataManager.get().roomUid
roomFollowOwnerAttachment.userInfo = userInfo
@@ -1213,7 +1217,8 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : com.pikolive.app.avroom.pres
*/
@Subscribe(threadMode = ThreadMode.MAIN)
open fun onRoomAtEvent(event: RoomAtEvent) {
if (atProxy == null) atProxy = AtProxy(inputEdit)
if (atProxy == null) atProxy =
AtProxy(inputEdit)
showInputLayout()
atProxy?.insertAitMember(event.account, event.name)
}
@@ -1259,7 +1264,8 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : com.pikolive.app.avroom.pres
.subscribe { aBoolean: Boolean ->
if (aBoolean) {
AudioEngineManager.get().isMute = !AudioEngineManager.get().isMute
AudioEngineManager.get().setRole(Constants.CLIENT_ROLE_BROADCASTER)
AudioEngineManager.get().setRole(
Constants.CLIENT_ROLE_BROADCASTER)
updateMicBtn()
} else {
toast("開啟權限後才能開麥")
@@ -1272,7 +1278,8 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : com.pikolive.app.avroom.pres
if (AudioEngineManager.get().isMute) {
AudioEngineManager.get().stopLocalAudio()
} else if (AvRoomDataManager.get().isOnMic(myUid)) {
AudioEngineManager.get().setRole(Constants.CLIENT_ROLE_BROADCASTER)
AudioEngineManager.get().setRole(
Constants.CLIENT_ROLE_BROADCASTER)
}
}
}

10
app/src/main/java/com/pikolive/app/avroom/fragment/FakeSingleRoomBackFragment.kt
View File

@@ -4,11 +4,11 @@ import android.annotation.SuppressLint
import com.yizhuan.erban.R
import com.pikolive.app.base.BaseViewBindingFragment
import com.yizhuan.erban.databinding.FragmentFakeSingleRoomBinding
import com.yizhuan.xchat_android_core.room.bean.RoomInfo
import com.yizhuan.xchat_android_core.room.event.SwitchRoomEvent
import com.yizhuan.xchat_android_core.room.model.AvRoomModel
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
import com.yizhuan.xchat_android_core.utils.StringUtils
import com.pikolive.core.room.bean.RoomInfo
import com.pikolive.core.room.event.SwitchRoomEvent
import com.pikolive.core.room.model.AvRoomModel
import com.pikolive.core.utils.CurrentTimeUtils
import com.pikolive.core.utils.StringUtils
import com.pikolive.library.utils.ResUtil
import io.reactivex.Single
import io.reactivex.android.schedulers.AndroidSchedulers

20
app/src/main/java/com/pikolive/app/avroom/fragment/FakeSingleRoomFragment.kt
View File

@@ -9,12 +9,12 @@ import com.yizhuan.erban.R
import com.pikolive.app.avroom.activity.AVRoomActivity
import com.pikolive.app.base.BaseViewBindingFragment
import com.yizhuan.erban.databinding.FragmentFakeSingleRoomBinding
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.bean.RoomInfo
import com.yizhuan.xchat_android_core.room.event.SwitchRoomEvent
import com.yizhuan.xchat_android_core.room.model.AvRoomModel
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
import com.yizhuan.xchat_android_core.utils.StringUtils
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.room.bean.RoomInfo
import com.pikolive.core.room.event.SwitchRoomEvent
import com.pikolive.core.room.model.AvRoomModel
import com.pikolive.core.utils.CurrentTimeUtils
import com.pikolive.core.utils.StringUtils
import io.reactivex.Single
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
@@ -76,8 +76,12 @@ class FakeSingleRoomFragment : BaseViewBindingFragment<FragmentFakeSingleRoomBin
}
private fun jumpRoom(roomInfo: RoomInfo) {
EventBus.getDefault().post(SwitchRoomEvent(AvRoomDataManager.get().mCurrentRoomInfo))
com.pikolive.app.avroom.activity.AVRoomActivity.start(mContext, roomInfo)
EventBus.getDefault().post(
SwitchRoomEvent(
AvRoomDataManager.get().mCurrentRoomInfo
)
)
AVRoomActivity.start(mContext, roomInfo)
reSet()
}

10
app/src/main/java/com/pikolive/app/avroom/fragment/GameRoomFragment.kt
View File

@@ -15,11 +15,11 @@ import com.pikolive.app.avroom.game.OnGameStatusChangeListener
import com.pikolive.app.avroom.redpackage.RedPackageWidget
import com.yizhuan.erban.databinding.FragmentGameRoomBinding
import com.pikolive.app.ui.widget.GiftDialog.OnGiftDialogBtnClickListener
import com.yizhuan.xchat_android_core.home.bean.BannerInfo
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.music.model.PlayerModel
import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent
import com.yizhuan.xchat_android_core.room.event.FinishAvRoomEvent
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.music.model.PlayerModel
import com.pikolive.core.pay.event.FirstChargeEvent
import com.pikolive.core.room.event.FinishAvRoomEvent
import com.pikolive.core2.home.bean.BannerInfo
import com.pikolive.library.base.factory.CreatePresenter
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode

50
app/src/main/java/com/pikolive/app/avroom/fragment/HomePartyFragment.java
View File

@@ -39,31 +39,31 @@ import com.pikolive.app.friend.view.SelectFriendActivity;
import com.pikolive.app.home.helper.OpenRoomHelper;
import com.pikolive.app.ui.widget.ShareDialog;
import com.pikolive.app.utils.RegexUtil;
import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo;
import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo;
import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts;
import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo;
import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent;
import com.yizhuan.xchat_android_core.home.event.ShareRoomEvent;
import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomInfoAttachment;
import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo;
import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.praise.PraiseModel;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomModeType;
import com.yizhuan.xchat_android_core.room.game.GameInfo;
import com.yizhuan.xchat_android_core.room.game.GameModel;
import com.yizhuan.xchat_android_core.room.queuing_mic.event.HasAnimationEffect;
import com.yizhuan.xchat_android_core.share.ShareModel;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.Logger;
import com.pikolive.core.gift.bean.GiftMultiReceiverInfo;
import com.pikolive.core.gift.bean.GiftReceiveInfo;
import com.pikolive.core.gift.bean.LuckyBagGifts;
import com.pikolive.core.gift.bean.MultiGiftReceiveInfo;
import com.pikolive.core2.home.event.FollowRoomEvent;
import com.pikolive.core2.home.event.ShareRoomEvent;
import com.pikolive.core2.home.model.CollectionRoomModel;
import com.pikolive.core.im.custom.bean.CustomAttachment;
import com.pikolive.core.im.custom.bean.RoomInfoAttachment;
import com.pikolive.core.magic.bean.MagicReceivedInfo;
import com.pikolive.core.magic.bean.MultiMagicReceivedInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core2.manager.IMNetEaseManager;
import com.pikolive.core.manager.RoomEvent;
import com.pikolive.core.praise.PraiseModel;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.bean.RoomModeType;
import com.pikolive.core.room.game.GameInfo;
import com.pikolive.core.room.game.GameModel;
import com.pikolive.core.room.queuing_mic.event.HasAnimationEffect;
import com.pikolive.core.share.ShareModel;
import com.pikolive.core.admin.util.SuperAdminUtil;
import com.pikolive.core.user.UserModel;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.core.utils.Logger;
import com.pikolive.library.utils.JavaUtil;
import com.pikolive.library.utils.ResUtil;
import com.pikolive.library.utils.SingleToastUtil;

52
app/src/main/java/com/pikolive/app/avroom/fragment/HomePartyRoomFragment.java
View File

@@ -36,32 +36,32 @@ import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper;
import com.pikolive.app.ui.webview.DatingRuleWebViewActivity;
import com.pikolive.app.ui.webview.DialogWebViewActivity;
import com.pikolive.app.utils.UserUtils;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
import com.yizhuan.xchat_android_core.home.event.ShareRoomEvent;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPKAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel;
import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.event.DatingSelectUserEvent;
import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel;
import com.yizhuan.xchat_android_core.room.face.FaceInfo;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.room.model.MicQueueModel;
import com.yizhuan.xchat_android_core.room.pk.bean.PKRespQueuingMicListInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData;
import com.yizhuan.xchat_android_core.room.pk.event.PKStateEvent;
import com.yizhuan.xchat_android_core.room.pk.model.PkModel;
import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RespQueuingMicListInfo;
import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicEmptyEvent;
import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicNotEmptyEvent;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils;
import com.pikolive.core.Constants;
import com.pikolive.core2.UriProvider;
import com.pikolive.core.auth.AuthModel;
import com.pikolive.core2.home.bean.BannerInfo;
import com.pikolive.core2.home.event.ShareRoomEvent;
import com.pikolive.core.im.custom.bean.RoomPKAttachment;
import com.pikolive.core.im.custom.bean.RoomPkBean;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.manager.RoomEvent;
import com.pikolive.core2.market_verify.MarketVerifyModel;
import com.pikolive.core.pay.event.FirstChargeEvent;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.event.DatingSelectUserEvent;
import com.pikolive.core.room.face.DynamicFaceModel;
import com.pikolive.core.room.face.FaceInfo;
import com.pikolive.core.room.model.AvRoomModel;
import com.pikolive.core.room.model.MicQueueModel;
import com.pikolive.core.room.pk.bean.PKRespQueuingMicListInfo;
import com.pikolive.core.room.pk.bean.RoomPkData;
import com.pikolive.core.room.pk.event.PKStateEvent;
import com.pikolive.core.room.pk.model.PkModel;
import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo;
import com.pikolive.core.room.queuing_mic.event.QueuingMicEmptyEvent;
import com.pikolive.core.room.queuing_mic.event.QueuingMicNotEmptyEvent;
import com.pikolive.core.admin.util.SuperAdminUtil;
import com.pikolive.core.utils.CurrentTimeUtils;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.utils.ResUtil;
import com.pikolive.library.utils.SingleToastUtil;

6
app/src/main/java/com/pikolive/app/avroom/fragment/IRoomRankHalfHourView.java
View File

@@ -1,8 +1,8 @@
package com.pikolive.app.avroom.fragment;
import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourMeInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourRankInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem;
import com.pikolive.core.room.bean.RoomRankHalfHourMeInfo;
import com.pikolive.core.room.bean.RoomRankHalfHourRankInfo;
import com.pikolive.core.room.bean.RoomRankMultiItem;
import com.pikolive.library.base.IMvpBaseView;
import java.util.List;

10
app/src/main/java/com/pikolive/app/avroom/fragment/InviteFriendListFragment.java
View File

@@ -11,11 +11,11 @@ import com.yizhuan.erban.R;
import com.pikolive.app.avroom.adapter.InviteFriendListAdapter;
import com.pikolive.app.base.BaseFragment;
import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallFriendInfo;
import com.yizhuan.xchat_android_core.im.friend.IMFriendModel;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RelationShipEvent;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.pikolive.core.im.friend.IMFriendModel;
import com.pikolive.core2.manager.IMNetEaseManager;
import com.pikolive.core.manager.RelationShipEvent;
import com.pikolive.core.user.UserModel;
import com.pikolive.core.user.bean.UserInfo;
import com.pikolive.library.utils.ListUtils;
import org.greenrobot.eventbus.EventBus;

10
app/src/main/java/com/pikolive/app/avroom/fragment/OnlineUserFragment.java
View File

@@ -18,11 +18,11 @@ import com.yizhuan.erban.R;
import com.pikolive.app.avroom.adapter.OnlineUserAdapter;
import com.pikolive.app.base.BaseMvpFragment;
import com.pikolive.app.ui.widget.UserInfoDialog;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.pikolive.core.Constants;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.bean.OnlineChatMember;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.admin.util.SuperAdminUtil;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.utils.JavaUtil;
import com.pikolive.library.utils.ListUtils;

2
app/src/main/java/com/pikolive/app/avroom/fragment/RoomCharmListFragment.java
View File

@@ -9,7 +9,7 @@ import com.pikolive.app.base.BaseBindingFragment;
import com.yizhuan.erban.databinding.FragmentRoomCharmListBinding;
import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper;
import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo;
import com.pikolive.core.room.bean.RoomContributeDataInfo;
import com.pikolive.library.annatation.ActLayoutRes;
import java.util.ArrayList;

10
app/src/main/java/com/pikolive/app/avroom/fragment/RoomCharmRankingListFragment.java
View File

@@ -21,11 +21,11 @@ import com.pikolive.app.avroom.adapter.RoomConsumerListAdapterTemp;
import com.pikolive.app.base.BaseMvpFragment;
import com.pikolive.app.ui.widget.GiftDialog;
import com.pikolive.app.ui.widget.UserInfoDialog;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem;
import com.pikolive.core.Constants;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.bean.RoomContributeUserInfo;
import com.pikolive.core.room.bean.RoomInfo;
import com.pikolive.core.room.bean.RoomRankMultiItem;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.utils.ListUtils;
import com.pikolive.library.utils.ResUtil;

8
app/src/main/java/com/pikolive/app/avroom/fragment/RoomContributeFragment.java
View File

@@ -18,10 +18,10 @@ import com.yizhuan.erban.R;
import com.pikolive.app.avroom.adapter.RoomConsumerListAdapterTemp;
import com.pikolive.app.base.BaseMvpFragment;
import com.pikolive.app.ui.widget.UserInfoDialog;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem;
import com.pikolive.core.Constants;
import com.pikolive.core.room.bean.RoomContributeDataInfo;
import com.pikolive.core.room.bean.RoomContributeUserInfo;
import com.pikolive.core.room.bean.RoomRankMultiItem;
import com.pikolive.library.base.factory.CreatePresenter;
import com.pikolive.library.utils.ListUtils;

4
app/src/main/java/com/pikolive/app/avroom/fragment/RoomContributeListFragment.java
View File

@@ -10,8 +10,8 @@ import com.pikolive.app.base.BaseMvpFragment;
import com.pikolive.app.ui.widget.magicindicator.MagicIndicator;
import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper;
import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo;
import com.pikolive.core.manager.AvRoomDataManager;
import com.pikolive.core.room.bean.RoomContributeDataInfo;
import com.pikolive.library.base.IMvpBaseView;
import java.util.ArrayList;

31
app/src/main/java/com/pikolive/app/avroom/fragment/SingleRoomFragment.kt
View File

@@ -26,17 +26,17 @@ import com.pikolive.app.ui.utils.load
import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper
import com.pikolive.app.ui.webview.CommonWebViewActivity
import com.pikolive.app.ui.webview.DialogWebViewActivity
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.fansteam.FansTeamInitInfo
import com.yizhuan.xchat_android_core.home.bean.BannerInfo
import com.yizhuan.xchat_android_core.im.custom.bean.FansTeamMsgAttachment
import com.yizhuan.xchat_android_core.im.custom.bean.RequestUpmicAttachment
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPKAttachment
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.manager.RoomEvent
import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent
import com.yizhuan.xchat_android_core.user.bean.UserInfo
import com.pikolive.core.auth.AuthModel
import com.pikolive.core.fansteam.FansTeamInitInfo
import com.pikolive.core.im.custom.bean.FansTeamMsgAttachment
import com.pikolive.core.im.custom.bean.RequestUpmicAttachment
import com.pikolive.core.im.custom.bean.RoomPKAttachment
import com.pikolive.core.manager.AvRoomDataManager
import com.pikolive.core.manager.RoomEvent
import com.pikolive.core.pay.event.FirstChargeEvent
import com.pikolive.core.user.bean.UserInfo
import com.pikolive.core2.UriProvider
import com.pikolive.core2.home.bean.BannerInfo
import com.pikolive.library.base.factory.CreatePresenter
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -110,7 +110,8 @@ class SingleRoomFragment : BaseRoomFragment<com.pikolive.app.avroom.view.ISingle
gameBinding.tvHourRank.setOnClickListener {
DialogWebViewActivity.start(
mContext,
UriProvider.getSingleRoomHourRankUrl(AvRoomDataManager.get().roomUid)
UriProvider.getSingleRoomHourRankUrl(
AvRoomDataManager.get().roomUid)
)
}
}
@@ -132,7 +133,8 @@ class SingleRoomFragment : BaseRoomFragment<com.pikolive.app.avroom.view.ISingle
clickListener = View.OnClickListener {
DialogWebViewActivity.start(
requireContext(),
UriProvider.getFansTeamMyFansUrl(AvRoomDataManager.get().roomUid)
UriProvider.getFansTeamMyFansUrl(
AvRoomDataManager.get().roomUid)
)
}
} else {
@@ -154,7 +156,8 @@ class SingleRoomFragment : BaseRoomFragment<com.pikolive.app.avroom.view.ISingle
clickListener = View.OnClickListener {
CommonWebViewActivity.start(
requireContext(),
UriProvider.getFansTeamOpenUrl(AvRoomDataManager.get().roomUid)
UriProvider.getFansTeamOpenUrl(
AvRoomDataManager.get().roomUid)
)
}
} else {

Some files were not shown because too many files have changed in this diff Show More