From cb99c98351749a4b620ac64f0a0595089e929af0 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Tue, 14 Mar 2023 15:20:06 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E7=A7=BB=E9=99=A4=E5=8F=8B=E7=9B=9F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/erban/MainActivity.java | 8 +- .../main/java/com/yizhuan/erban/UIHelper.java | 5 - .../erban/application/XChatApplication.java | 18 - .../yizhuan/erban/audio/MyVoiceActivity.java | 9 +- .../erban/audio/RecordingVoiceActivity.java | 3 - .../erban/audio/SoundSignatureActivity.kt | 6 - .../erban/audio/VoiceMatchActivity.java | 11 - .../presenter/RecordingVoicePresenter.java | 3 - .../erban/audio/view/BottleLayout.java | 6 - .../erban/avroom/ButtonItemFactory.java | 14 +- .../erban/avroom/activity/AVRoomActivity.java | 9 - .../avroom/activity/CreatePKActivity.java | 24 +- .../avroom/activity/RoomSettingActivity.java | 10 - .../erban/avroom/dialog/NewUserGiftDialog.kt | 6 - .../avroom/dialog/PKScoreBoardDialog.java | 8 - .../erban/avroom/dialog/RoomImposeDialog.java | 7 - .../avroom/dialog/RoomOperationDialog.java | 6 +- .../avroom/firstcharge/FirstChargeDialog.kt | 4 +- .../erban/avroom/fragment/BaseRoomFragment.kt | 70 +--- .../avroom/fragment/HomePartyFragment.java | 6 +- .../NewUserChargePrizeDialog.kt | 9 - .../avroom/presenter/AvRoomPresenter.java | 6 +- .../presenter/RoomSettingPresenter.java | 6 - .../RecommendCardListAdapter.java | 7 +- .../avroom/redpackage/RedPackageSendDialog.kt | 8 +- .../erban/avroom/widget/BottomView.java | 5 - .../erban/avroom/widget/MessageView.java | 9 - .../com/yizhuan/erban/base/BaseActivity.java | 35 +- .../activities/BillGiftExpendActivity.java | 5 +- .../activities/BillGiftInComeActivity.java | 4 +- .../BillGiftIncomeGroupActivity.java | 4 +- .../bills/activities/ChargeBillsActivity.java | 4 +- .../bills/activities/RedBagBillsActivity.java | 4 +- .../activities/WithdrawBillsActivity.java | 4 +- .../common/widget/dialog/DialogUiHelper.java | 6 +- .../view/DecorationStoreActivity.kt | 4 +- .../erban/earn/activity/EarnRecordActivity.kt | 4 +- .../view/activity/FamilyHomeActivity.java | 9 +- .../view/activity/FamilyPlazaActivity.java | 8 - .../com/yizhuan/erban/home/HomeViewModel.kt | 9 - .../home/activity/CollectionRoomActivity.java | 4 - .../home/adapter/HomeConcernsAdapter.java | 5 - .../erban/home/adapter/HomeLiveTopAdapter.kt | 8 - .../home/adapter/HomeRoomFragmentAdapter.java | 4 - .../home/adapter/HomeSingleAnchorAdapter.kt | 5 - .../erban/home/adapter/HomeTopAdapter.java | 5 +- .../erban/home/adapter/MeCenterAdapter.kt | 8 - .../home/adapter/MoreSingleAnchorAdapter.kt | 5 - .../erban/home/adapter/RoomActAdapter.java | 17 - .../erban/home/adapter/RoomGameAdapter.kt | 4 - .../erban/home/adapter/RoomHotAdapter.kt | 5 - .../erban/home/adapter/RoomLikeAdapter.kt | 5 - .../yizhuan/erban/home/fragment/MeFragment.kt | 31 +- .../erban/home/widget/AnchorCardView.kt | 14 - .../view/LuckyMoneyCreationActivity.java | 4 +- .../main/helper/NoticationsUiHelper.java | 7 +- .../erban/other/activity/SplashActivity.java | 8 +- .../radish/activity/RadishRecordActivity.java | 3 - .../radish/helper/PrizeAnimUiHelper.java | 8 - .../erban/radish/signin/SignInActivity.java | 7 - .../radish/signin/view/SignInDialog.java | 10 - .../task/activity/TaskCenterActivity.java | 4 - .../task/fragment/TaskCenterFragment.java | 22 -- .../erban/treasurefairy/HomeFairyActivity.kt | 6 - .../yizhuan/erban/ui/im/RouterHandler.java | 11 +- .../erban/ui/im/actions/ChatterBoxAction.java | 5 - .../erban/ui/im/actions/GiftAction.java | 4 - .../erban/ui/im/chat/MVHChatterBoxStart.java | 7 - .../ui/im/chat/MsgViewHolderAudioParty.java | 7 - .../erban/ui/im/fragment/MessageFragment.java | 5 +- .../ui/im/friend/FriendFragmentCpDelegate.kt | 4 +- .../ui/im/recent/RecentListFragment.java | 15 +- .../erban/ui/login/LoginCodeActivity.kt | 8 - .../login/fragment/AddUserInfoFragment.java | 16 - .../erban/ui/login/helper/LogoutHelper.java | 4 - .../erban/ui/search/SearchActivity.java | 8 - .../erban/ui/search/SearchAdapter.java | 3 - .../ui/setting/NoticeSettingActivity.java | 6 - .../ui/user/activity/UserInfoActivity.java | 23 -- .../erban/ui/user/adapter/UserDesAdapter.java | 5 - .../user/adapter/UserInfoDynamicAdapter.java | 7 - .../user/fragment/UserInfoDynamicFragment.kt | 14 - .../ui/user/fragment/UserInfoInfoFragment.kt | 14 - .../yizhuan/erban/ui/webview/JSInterface.java | 22 +- .../yizhuan/erban/ui/widget/GiftDialog.java | 4 +- .../erban/ui/widget/MainTabLayout.java | 7 - .../erban/ui/widget/UserInfoDialog.java | 21 +- .../dialog/AllServiceGiftLevelOneDialog.java | 5 - .../AllServiceGiftLevelThreeDialog.java | 5 - .../dialog/AllServiceGiftLevelTwoDialog.java | 7 +- .../widget/dynamicface/DynamicFaceDialog.java | 6 +- .../com/yizhuan/erban/utils/DeviceUtil.kt | 118 ------- .../com/yizhuan/erban/vip/VipMainActivity.kt | 4 +- .../dynamic/adapter/WorldDynamicAdapter.java | 7 - .../dynamic/view/DynamicDetailActivity.java | 17 - .../dynamic/view/WorldDynamicFragment.java | 20 +- .../publish/presenter/PublishPresenter.java | 13 - .../publish/view/PublishActivity.java | 15 +- .../square/SquareDynamicFragment.java | 4 - .../community/square/SquareFragment.java | 21 -- .../square/adapter/SquareDynamicAdapter.java | 9 - .../user_dynamic/UserDynamicFrg.java | 9 - .../user_dynamic/UserDynamicPresenter.java | 4 - .../community/widget/ExpandableTextView.java | 4 - .../activity/IncomeStatisticsActivity.java | 9 - .../hall/activity/ModuleClanActivity.java | 5 - .../hall/activity/ModuleHallActivity.java | 5 - .../activity/SingleRoomIncomeActivity.java | 5 - .../income/IncomeDetailActivity.java | 7 - .../MentoringRelationshipActivity.java | 13 +- .../dialog/GrabApprenticesNoticeDialog.java | 17 +- .../miniworld/activity/AudioPartyDialog.java | 7 - .../activity/MiniWorldEditActivity.java | 3 - .../activity/MiniWorldGroupThemeActivity.java | 4 - .../activity/MiniWorldGuestPageActivity.java | 50 +-- .../activity/MiniWorldMainActivity.java | 11 - .../activity/MiniWorldMemberListActivity.java | 3 - .../activity/MiniWorldSearchActivity.java | 5 - .../MiniWorldTeamMessageActivity.java | 10 - .../miniworld/activity/TopicMainActivity.java | 27 +- .../fragment/MiniWorldCategoryFragment.java | 4 - .../MiniWorldGuestPagePresenter.java | 6 - .../activity/AddLocalMusicListActivity.java | 3 - .../music/activity/MusicListActivity.java | 3 - .../fragment/LocalMusicListFragment.java | 3 - .../fragment/ShareMusicListFragment.java | 11 - .../tutu/music/widget/MusicPlayerView.java | 8 - .../PublicChatHallMessageFragment.java | 24 +- .../activity/RoomInviteFansActivity.java | 3 - .../fragment/RoomMsgRecentListFragment.java | 3 - .../ChooseTreasureBoxDialogFragment.java | 29 +- .../treasure_box/widget/GoldBoxHelper.java | 7 - core/build.gradle | 3 - .../XChatConstants.java | 5 - .../manager/IMNetEaseManager.java | 51 --- .../retry/ImRetryManager.java | 8 - .../manager/IMSystemMsgManager.java | 27 -- .../radish/signin/SignInModel.java | 15 +- .../room/model/AvRoomModel.java | 13 +- .../statistic/StatisticManager.java | 95 ------ .../statistic/StatisticModel.java | 63 ---- .../community/dynamic/DynamicDetailModel.java | 21 +- .../community/dynamic/DynamicModel.java | 20 -- .../module_hall/hall/HallModel.java | 5 - library/build.gradle | 2 + .../service/ErBanService.java | 5 - .../common/util/DeviceUtil.kt | 314 ++++++++++++++++++ 147 files changed, 459 insertions(+), 1543 deletions(-) delete mode 100644 app/src/main/java/com/yizhuan/erban/utils/DeviceUtil.kt delete mode 100644 core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java delete mode 100644 core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java create mode 100644 library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/DeviceUtil.kt diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index ca07146ba..508c46713 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -105,8 +105,6 @@ 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.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; 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; @@ -298,7 +296,6 @@ public class MainActivity extends BaseMvpActivity if (reason == null) return; //加入黑名单，踢出房间回调 ChatRoomKickOutEvent.ChatRoomKickOutReason reasonReason = reason.getReason(); - StatisticManager.Instance().onEvent(StatisticsProtocol.USER_KICKED_EVENT, getString(R.string.user_is_kicked)); if (reasonReason == ChatRoomKickOutEvent.ChatRoomKickOutReason.BE_BLACKLISTED || reasonReason == ChatRoomKickOutEvent.ChatRoomKickOutReason.KICK_OUT_BY_MANAGER || reasonReason == ChatRoomKickOutEvent.ChatRoomKickOutReason.KICK_OUT_BY_CONFLICT_LOGIN @@ -312,7 +309,6 @@ public class MainActivity extends BaseMvpActivity } else if (event == RoomEvent.MY_SELF_KICK_OUT_ROOM_BY_S_ADMIN) { AvRoomDataManager.get().addCurrentRoomLimitEnter(); toast(R.string.kick_out_room_by_s_admin); - StatisticManager.Instance().onEvent(StatisticsProtocol.USER_KICKED_EVENT, getString(R.string.user_is_kicked)); getMvpPresenter().exitRoom(); } } @@ -641,7 +637,7 @@ public class MainActivity extends BaseMvpActivity @SuppressLint("SetTextI18n") private void displayAvatarLayout(String avatar, String nickName, long uid) { RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo; - if(roomInfo != null) { + if (roomInfo != null) { avatarLayout.clearAnimation(); avatarLayout.setVisibility(View.VISIBLE); userLivingView.start(); @@ -975,8 +971,6 @@ public class MainActivity extends BaseMvpActivity break; case R.id.view_close: - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_MINIMIZE_CLOSED, - getString(R.string.room_minimization_close_button)); MainActivity.this.getMvpPresenter().exitRoom(); break; } diff --git a/app/src/main/java/com/yizhuan/erban/UIHelper.java b/app/src/main/java/com/yizhuan/erban/UIHelper.java index 953ce08a2..1034cdf1b 100644 --- a/app/src/main/java/com/yizhuan/erban/UIHelper.java +++ b/app/src/main/java/com/yizhuan/erban/UIHelper.java @@ -16,10 +16,7 @@ import com.yizhuan.erban.ui.user.activity.UserInfoModifyActivity; import com.yizhuan.erban.ui.user.activity.UserModifyPhotosActivity; import com.yizhuan.erban.ui.webview.CommonWebViewActivity; import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; /** @@ -81,13 +78,11 @@ public class UIHelper { } public static void showMyVoiceAct(Activity mActivity, int requestCode, String label) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MY_SOUND, ResUtil.getString(R.string.yizhuan_erban_uihelper_03) + label); Intent intent = new Intent(mActivity, MyVoiceActivity.class); mActivity.startActivityForResult(intent, requestCode); } public static void showSoundAct(Activity mActivity, int requestCode, String label, UserInfo.SoundBean audioCard) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MY_SOUND, ResUtil.getString(R.string.yizhuan_erban_uihelper_03) + label); Intent intent = new Intent(mActivity, SoundSignatureActivity.class); intent.putExtra(SoundSignatureActivity.AUDIO_BEAN, audioCard); mActivity.startActivityForResult(intent, requestCode); diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index 55828abaf..fe08059e7 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java @@ -41,8 +41,6 @@ import com.scwang.smartrefresh.header.MaterialHeader; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.footer.ClassicsFooter; import com.tencent.vasdolly.helper.ChannelReaderUtil; -import com.umeng.analytics.MobclickAgent; -import com.umeng.commonsdk.UMConfigure; import com.yizhuan.erban.AgentActivity; import com.yizhuan.erban.BuildConfig; import com.yizhuan.erban.NimMiddleActivity; @@ -76,8 +74,6 @@ 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.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; 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; @@ -262,17 +258,6 @@ public class XChatApplication extends BaseApp { initLinkedMe(); MobSDK.init(context); MobSDK.submitPolicyGrantResult(true); - // 友盟统计初始化 - UMConfigure.init(context, XChatConstants.UMENG_APP_KEY, - BasicConfig.INSTANCE.getChannel(), UMConfigure.DEVICE_TYPE_PHONE, null); - // 选用MANUAL页面采集模式 - MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.MANUAL); - // 支持在子进程中统计自定义事件 - UMConfigure.setProcessEvent(true); - // 日志加密 - UMConfigure.setEncryptEnabled(true); - // 集成测试 - UMConfigure.setLogEnabled(BuildConfig.DEBUG); } LogUtils.d("init time = " + (System.currentTimeMillis() - startTime) + "ms"); @@ -447,10 +432,7 @@ public class XChatApplication extends BaseApp { .build(); Realm.setDefaultConfiguration(config); - LogUtil.i(TAG, channel); - //APP启动埋点 - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_APP_LAUNCH, ResUtil.getString(R.string.erban_application_xchatapplication_04)); } /** diff --git a/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java b/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java index 82df3a147..0c918b0a0 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java +++ b/app/src/main/java/com/yizhuan/erban/audio/MyVoiceActivity.java @@ -1,6 +1,7 @@ package com.yizhuan.erban.audio; import android.Manifest; +import android.annotation.SuppressLint; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; @@ -20,8 +21,6 @@ import com.yizhuan.erban.common.NoDataFragment; import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; import com.yizhuan.erban.ui.widget.recyclerview.decoration.HorizontalDecoration; import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -60,6 +59,7 @@ public class MyVoiceActivity extends BaseMvpActivity { if (result) { - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_MY_SOUND_RERECORD, ResUtil.getString(R.string.erban_audio_myvoiceactivity_02)); UIHelper.showRecordVoiceAct(MyVoiceActivity.this, MyVoiceActivity.REQUEST_CODE_RECORDING_VOICE, item.getId());// 点击跳转到录制声音页面 } @@ -165,12 +163,11 @@ public class MyVoiceActivity extends BaseMvpActivity { checkPermission(Manifest.permission.RECORD_AUDIO) .subscribe(result -> { if (result) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MY_SOUND_RECORD, ResUtil.getString(R.string.erban_audio_myvoiceactivity_04)); // 录制入口 UIHelper.showRecordVoiceAct(this, REQUEST_CODE_RECORDING_VOICE, -1); } diff --git a/app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java b/app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java index c7bf152f5..aee751c02 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java +++ b/app/src/main/java/com/yizhuan/erban/audio/RecordingVoiceActivity.java @@ -44,8 +44,6 @@ import com.yizhuan.erban.base.BaseMvpActivity; import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo; import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -137,7 +135,6 @@ public class RecordingVoiceActivity extends BaseMvpActivity" + "VH = " + viewHolder + ResUtil.getString(R.string.erban_audio_recordingvoiceactivity_07) + pos + ResUtil.getString(R.string.erban_audio_recordingvoiceactivity_08) + (direction == VoiceCardConfig.SWIPED_LEFT ? ResUtil.getString(R.string.erban_audio_recordingvoiceactivity_09) : direction == VoiceCardConfig.SWIPED_RIGHT ? ResUtil.getString(R.string.erban_audio_recordingvoiceactivity_010) : ResUtil.getString(R.string.erban_audio_recordingvoiceactivity_011))); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MY_SOUND_TEXT_SWITCH, ResUtil.getString(R.string.erban_audio_recordingvoiceactivity_012)); viewHolder.itemView.setAlpha(1f); cardAdapter.removeItem(pos); if (cardAdapter.getItemCount() < VoiceCardConfig.DEFAULT_SHOW_ITEM) { diff --git a/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt b/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt index 40d4bb596..d98b4101f 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/audio/SoundSignatureActivity.kt @@ -25,8 +25,6 @@ import com.yizhuan.erban.databinding.ActivitySoundSignatureBinding import com.yizhuan.erban.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.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_core.user.bean.UserInfo.SoundBean import com.yizhuan.xchat_android_library.utils.ResUtil import com.yizhuan.xchat_android_library.utils.SingleToastUtil @@ -158,10 +156,6 @@ class SoundSignatureActivity : BaseViewBindingActivity { String label = gender == 1 ? ResUtil.getString(R.string.erban_audio_voicematchactivity_08) : gender == 2 ? ResUtil.getString(R.string.erban_audio_voicematchactivity_09) : ResUtil.getString(R.string.erban_audio_voicematchactivity_010); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SOUND_MATCH_CHOICE_SEX, ResUtil.getString(R.string.erban_audio_voicematchactivity_011) + label); filterGender = gender; SharedPreferenceUtils.put("voice_match_filter_gender_" + AuthModel.get().getCurrentUid(), filterGender); @@ -557,7 +552,6 @@ public class VoiceMatchActivity extends BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/audio/presenter/RecordingVoicePresenter.java b/app/src/main/java/com/yizhuan/erban/audio/presenter/RecordingVoicePresenter.java index 6b7a079d8..f69e44cff 100644 --- a/app/src/main/java/com/yizhuan/erban/audio/presenter/RecordingVoicePresenter.java +++ b/app/src/main/java/com/yizhuan/erban/audio/presenter/RecordingVoicePresenter.java @@ -26,8 +26,6 @@ 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.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.base.PresenterEvent; import com.yizhuan.xchat_android_library.utils.ListUtils; @@ -298,7 +296,6 @@ public class RecordingVoicePresenter extends BaseMvpPresenter { if (throwable != null) { if (throwable.getMessage().contains("404")) { @@ -357,7 +353,7 @@ public class ButtonItemFactory { } } else { IMNetEaseManager.get().kickMemberFromRoomBySdk(Long.valueOf(roomId), - Long.valueOf(account), nick) + Long.valueOf(account), nick) .subscribe(chatRoomMessage -> KickModel.get().sendMessage(chatRoomMessage)); @@ -376,9 +372,6 @@ public class ButtonItemFactory { String title = BasicConfig.INSTANCE.getAppContext().getString(mark ? R.string.set_manager : R.string.remove_manager); int icon = mark ? R.drawable.icon_dialog_set_manager_ture : R.drawable.icon_dialog_set_manager_false; return new ViewItem(title, icon, () -> { - if (mark) { - StatisticManager.Instance().onEvent(StatisticsProtocol.data_card_set_admin_click, ResUtil.getString(R.string.erban_avroom_buttonitemfactory_014)); - } if (AvRoomDataManager.get().isSuperAdmin()) { AvRoomModel.get().markManager(Long.parseLong(account), mark).subscribe(); } else { @@ -395,7 +388,6 @@ public class ButtonItemFactory { final String account, String nick) { return new ViewItem(ResUtil.getString(R.string.erban_avroom_buttonitemfactory_015), R.drawable.icon_dialog_mark_black_list, () -> { - StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_join_blacklist_click, ResUtil.getString(R.string.erban_avroom_buttonitemfactory_016)); int roomBlackListSize = 200; InitInfo initInfo = InitialModel.get().getCacheInitInfo(); if (initInfo != null && initInfo.getRoomBlackListSize() != 0) { @@ -462,7 +454,6 @@ public class ButtonItemFactory { public static ViewItem createSendGiftItem(final Context context, long otherUid, boolean isInRoom, boolean isHideMagicTab, final GiftDialog.OnGiftDialogBtnClickListener giftDialogBtnClickListener) { return new ViewItem(ResUtil.getString(R.string.erban_avroom_buttonitemfactory_026), R.drawable.icon_send_gift_ture, () -> { - StatisticManager.Instance().onEvent(StatisticsProtocol.data_card_gift_send_click, ResUtil.getString(R.string.erban_avroom_buttonitemfactory_027)); GiftDialog dialog = new GiftDialog(context, otherUid, isInRoom, false, isHideMagicTab); if (giftDialogBtnClickListener != null) { @@ -477,7 +468,6 @@ public class ButtonItemFactory { */ public static ViewItem createShutupItem(Context context, long uid) { return new ViewItem(ResUtil.getString(R.string.erban_avroom_buttonitemfactory_028), R.drawable.icon_shut_up, () -> { - StatisticManager.Instance().onEvent(StatisticsProtocol.public_chat_banword, ResUtil.getString(R.string.erban_avroom_buttonitemfactory_029)); new ShutUpDialog(context, uid).openDialog(); }); } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java index 6378581e3..ee8a1e477 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java @@ -121,8 +121,6 @@ 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.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; 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.user.UserModel; @@ -250,7 +248,6 @@ public class AVRoomActivity extends BaseMvpActivity { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_TASK_TOAST_CLICK, ResUtil.getString(R.string.avroom_activity_avroomactivity_013)); llTaskTips.setVisibility(View.GONE); CommonWebViewActivity.start(this, event.getTaskUrl()); }); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java index 82ee6de43..0d3c54dfe 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/activity/CreatePKActivity.java @@ -26,8 +26,6 @@ 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.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -274,9 +272,9 @@ public class CreatePKActivity extends BaseMvpActivity() { @Override public void onSubscribe(Disposable d) { @@ -285,11 +283,6 @@ public class CreatePKActivity extends BaseMvpActivity() { @Override public void onSubscribe(Disposable d) { @@ -362,11 +355,6 @@ public class CreatePKActivity extends BaseMvpActivity() { override fun init() { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_NUGIVE_POP_SHOW, ResUtil.getString(R.string.avroom_dialog_newusergiftdialog_01)) binding.ivClose.setOnClickListener { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_NUGIVE_POP_CLICK, ResUtil.getString(R.string.avroom_dialog_newusergiftdialog_02)) dismissAllowingStateLoss() } binding.ivGift.load(giftInfo.giftUrl) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKScoreBoardDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKScoreBoardDialog.java index 12e20af9a..1f6d91a74 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKScoreBoardDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKScoreBoardDialog.java @@ -22,8 +22,6 @@ 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.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; import com.yizhuan.xchat_android_library.utils.FormatUtils; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -193,12 +191,6 @@ public class PKScoreBoardDialog extends BaseDialog { @Override public void onSuccess(String s) { dismiss(); - StatisticManager.Instance().onEvent( - getContext(), - StatisticsProtocol.ROOM_RESTART_PK, - ResUtil.getString(R.string.avroom_dialog_pkscoreboarddialog_05), - null); - } @Override diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java index b03a9d1c1..de9ba019f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomImposeDialog.java @@ -24,8 +24,6 @@ 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.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; @@ -83,18 +81,13 @@ public class RoomImposeDialog extends BottomSheetDialog implements View.OnClickL if (roomInfo == null) return; switch (v.getId()) { case R.id.tv_invite: - StatisticManager.Instance().onEvent(StatisticsProtocol.roomcp_roomlimit_invitation_click, ResUtil.getString(R.string.avroom_dialog_roomimposedialog_01)); - context.startActivity(new Intent(context, CpRoomInviteActivity.class)); dismiss(); break; case R.id.tv_friend: - StatisticManager.Instance().onEvent(StatisticsProtocol.roomcp_roomlimit_friends_click, ResUtil.getString(R.string.avroom_dialog_roomimposedialog_02)); updateRoomInfo("", roomInfo, RoomInfo.IS_FRIEND); break; case R.id.tv_pwd: - StatisticManager.Instance().onEvent(StatisticsProtocol.roomcp_roomlimit_password_click, ResUtil.getString(R.string.avroom_dialog_roomimposedialog_03)); - String oldContent = ""; try { oldContent = DESUtils.DESAndBase64Decrypt(roomInfo.roomPwd); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java index a95770c5d..9834a1a8e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java @@ -46,8 +46,6 @@ 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.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; 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; @@ -533,9 +531,7 @@ public class RoomOperationDialog extends BottomSheetDialog { if (error != null) { SingleToastUtil.showToast(error); } else { - StatisticManager.Instance().onEvent( - StatisticsProtocol.EVENT_ROOM_GIFTVALUE_SWITCH, - ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_030) + isOpen); + } } }); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt index ff57ad5b9..8fe9c41ba 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt @@ -24,7 +24,6 @@ import com.appsflyer.AFInAppEventParameterName import com.appsflyer.AFInAppEventType import com.appsflyer.AppsFlyerLib import com.netease.nim.uikit.common.util.sys.ScreenUtil -import com.umeng.commonsdk.statistics.common.DeviceConfig import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.DialogFirstChargeBinding @@ -43,6 +42,7 @@ 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.yizhuan.xchat_android_library.common.util.DeviceUtil import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil import com.yizhuan.xchat_android_library.utils.ResUtil import com.yizhuan.xchat_android_library.utils.SingleToastUtil @@ -128,7 +128,7 @@ class FirstChargeDialog : BaseViewBindingActivity(), } else { CommonWebViewActivity.start( context, - UriProvider.getOfficialPay(6, DeviceConfig.getDeviceId(context)) + UriProvider.getOfficialPay(6, DeviceUtil.getDeviceId(context)) ) } } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt index e05e51f2d..de2c9e789 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt @@ -55,7 +55,6 @@ import com.yizhuan.erban.base.BaseMvpFragment import com.yizhuan.erban.event.OpenRoomIntroEvent import com.yizhuan.erban.friend.view.SelectFriendActivity import com.yizhuan.erban.home.adapter.RoomActAdapter -import com.yizhuan.erban.home.adapter.RoomActAdapter.RoomActClickListener import com.yizhuan.erban.shipantics.PullRadishActivity import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper import com.yizhuan.erban.ui.webview.DialogWebViewActivity @@ -100,8 +99,6 @@ 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.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol 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 @@ -115,7 +112,6 @@ import com.yizhuan.xchat_android_library.common.util.SPUtils import com.yizhuan.xchat_android_library.net.rxnet.utils.RxNetWorkUtils import com.yizhuan.xchat_android_library.rxbus.RxBus import com.yizhuan.xchat_android_library.utils.* -import com.yizhuan.xchat_android_library.utils.config.BasicConfig import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import org.greenrobot.eventbus.EventBus @@ -476,11 +472,6 @@ open class BaseRoomFragment?> : rollPagerView.setAnimationDurtion(500) bannerAdapter.notifyDataSetChanged() bannerAdapter.setRoomActClickListener { url -> - StatisticManager.Instance() - .onEvent( - StatisticsProtocol.EVENT_ROOM_PROMOTE_CLICK, - ResUtil.getString(R.string.avroom_fragment_baseroomfragment_03) - ) DialogWebViewActivity.start(mContext, url) } @@ -639,20 +630,10 @@ open class BaseRoomFragment?> : if (mClickLimit.checkForTime(500)) return when (v.id) { R.id.input_send -> { - StatisticManager.Instance() - .onEvent( - StatisticsProtocol.EVENT_ROOM_CHAT_CLICK, - ResUtil.getString(R.string.avroom_fragment_baseroomfragment_05) - ) sendMsg() } R.id.contribute_list -> { DialogWebViewActivity.start(mContext, UriProvider.getRoomRanking()) - StatisticManager.Instance() - .onEvent( - StatisticsProtocol.EVENT_MP_ROOM_RANKING_LIST_CLICK, - ResUtil.getString(R.string.avroom_fragment_baseroomfragment_06) - ) mvpPresenter?.loadRoomRank() } R.id.iv_first_charge_enter -> FirstChargeDialog.start(mContext) @@ -731,11 +712,6 @@ open class BaseRoomFragment?> : callback.onSuccess() } } - - if (AvRoomDataManager.get().isCpRoom) { - StatisticManager.Instance() - .onEvent(StatisticsProtocol.roomcp_gift_open_click, "禮物面板按鈕") - } } private fun onUpMicro() { @@ -923,11 +899,6 @@ open class BaseRoomFragment?> : isModify = false } if (isModify) { - if (AvRoomDataManager.get().isCpRoom) { - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_CP_ROOM_SET_TOPIC_CLICK, "設置房間話題") - } else StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_MP_ROOM_SET_TOPIC_CLICK, "設置房間話題") RoomTitleEditActivity.startForResult(activity, info.roomDesc, info.introduction) } else { val dialogFragment = @@ -1109,8 +1080,6 @@ open class BaseRoomFragment?> : if (CurrentTimeUtils.getCurrentTime() - lastSendTime > 10000) { sendMsg(phrases[position]) lastSendTime = CurrentTimeUtils.getCurrentTime() - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_ROOM_QUICKCHAT_CLICK, "語音房_快捷發言") } else { val roomInfo = AvRoomDataManager.get().mCurrentRoomInfo ?: return@setOnItemClickListener @@ -1128,8 +1097,6 @@ open class BaseRoomFragment?> : } override fun onFollowSuccess(position: Int) { - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_FOLLOW_OWNER_FROM_ROOM, "語音房-關註房主") messageView.changeFollowStatus(position, true) } @@ -1163,11 +1130,6 @@ open class BaseRoomFragment?> : if (giftDialog?.isShowing != true && !requireActivity().isFinishing) { giftDialog?.show() } - if (AvRoomDataManager.get().isCpRoom) { - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_CP_ROOM_GIFT_CLICK, "禮物面板按鈕") - } else StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_MP_ROOM_GIFT_CLICK, "禮物面板按鈕") } /** @@ -1246,10 +1208,7 @@ open class BaseRoomFragment?> : AudioEngineManager.get().isMute = !AudioEngineManager.get().isMute updateMicBtn() if (AudioEngineManager.get().isMute) { - StatisticManager.Instance().onEvent( - StatisticsProtocol.EVENT_MP_ROOM_CLOSE_MIC_CLICK, - "關閉麥克風" - ) + } else if (AvRoomDataManager.get().isOnMic(myUid)) { AudioEngineManager.get().setRole(Constants.CLIENT_ROLE_BROADCASTER) } @@ -1257,11 +1216,6 @@ open class BaseRoomFragment?> : } override fun onSendFaceBtnClick() { - if (AvRoomDataManager.get().isCpRoom) { - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_CP_ROOM_EMOTICON_CLICK, "表情面板按鈕") - } else StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_MP_ROOM_EMOTICON_CLICK, "表情面板按鈕") if (AvRoomDataManager.get().isOnMic(myUid) || AvRoomDataManager.get().isRoomOwner) { if (dynamicFaceDialog == null) { dynamicFaceDialog = DynamicFaceDialog(context) @@ -1282,10 +1236,6 @@ open class BaseRoomFragment?> : inputEdit.isFocusableInTouchMode = true inputEdit.requestFocus() KeyBoardUtils.showKeyBoard(context, inputEdit) - StatisticManager.Instance().onEvent( - BasicConfig.INSTANCE.appContext, - StatisticsProtocol.EVENT_ROOM_INPUT_BOX_CLICK, "底部文字輸入框點擊", null - ) } override fun onSendGiftBtnClick() { @@ -1294,38 +1244,20 @@ open class BaseRoomFragment?> : override fun onRemoteMuteBtnClick() { val isRemoteMute = !AudioEngineManager.get().isRemoteMute - if (isRemoteMute) { - if (AvRoomDataManager.get().isCpRoom) { - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_CP_ROOM_CLOSE_SOUND_CLICK, "關閉聲音") - } else StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_MP_ROOM_CLOSE_SOUND_CLICK, "關閉聲音") - } AudioEngineManager.get().isRemoteMute = isRemoteMute updateRemoteMuteBtn() } override fun onMoreBtnClick() { - if (AvRoomDataManager.get().isCpRoom) { - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_CP_ROOM_MORE_CLICK, "更多面板按鈕") - } else StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_MP_ROOM_MORE_CLICK, "更多面板按鈕") val dialog = RoomOperationDialog(mContext) dialog.setOnActionListener { redPackageSendDialog = RedPackageSendDialog() redPackageSendDialog?.show(activity) - StatisticManager.Instance().onEvent( - StatisticsProtocol.EVENT_ROOM_SENDHONGBAO_CLICK, - "進入發紅包頁面" - ) } dialog.show() } override fun onRoomMessageClick() { - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_ROOM_MESSAGE_CLICK, "語音房_消息") RoomMsgActivity.start(mContext) } } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java index 380376379..aae71ea53 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java @@ -59,8 +59,6 @@ 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.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; 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; @@ -145,7 +143,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe roomId.setText(htmlText); roomId.setOnLongClickListener(view -> { try { - if(id >0L) { + if (id > 0L) { ClipboardManager cm = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE); cm.setPrimaryClip(ClipData.newPlainText("text", String.valueOf(id))); toast(getString(R.string.have_copy)); @@ -544,7 +542,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe if (AvRoomDataManager.get().isRoomFans) { SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_010)); PraiseModel.get().setFollowRoomSuccessRoomTip(currentRoomInfo.getUid()); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_FOLLOW_BUTTON_CLICK, ResUtil.getString(R.string.avroom_fragment_homepartyfragment_011)); } }); @@ -571,7 +568,6 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe shareDialog = new ShareDialog(getActivity()); shareDialog.setOnShareDialogItemClick(this); shareDialog.show(); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_SHARE_CLICK, ResUtil.getString(R.string.avroom_fragment_homepartyfragment_012)); } @Override diff --git a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargePrizeDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargePrizeDialog.kt index d600b5470..7c4c3356b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargePrizeDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargePrizeDialog.kt @@ -8,10 +8,7 @@ import com.yizhuan.erban.databinding.DialogNewUserChargePrizeBinding import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog import com.yizhuan.erban.ui.utils.RVDelegate import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_library.annatation.ActLayoutRes -import com.yizhuan.xchat_android_library.utils.ResUtil @ActLayoutRes(R.layout.dialog_new_user_charge_prize) class NewUserChargePrizeDialog( @@ -32,12 +29,6 @@ class NewUserChargePrizeDialog( closeDialog() } rvDelegate.setNewData(firstChargeRewardList) - StatisticManager.Instance() - .onEvent( - StatisticsProtocol.EVENT_NUGIFT_POP_FINISH_CLICK, - ResUtil.getString(R.string.avroom_newuserchargegift_newuserchargeprizedialog_01), - mapOf("charge_money" to title) - ) } } \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java index 05025605b..a739d893e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/AvRoomPresenter.java @@ -47,8 +47,6 @@ import com.yizhuan.xchat_android_core.room.model.MicQueueModel; import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicMemeberInfo; import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicNotEmptyEvent; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.super_admin.SuperAdminDataMrg; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; @@ -120,8 +118,6 @@ public class AvRoomPresenter extends BaseMvpPresenter { exitRoom(); } AvRoomDataManager.get().updateServiceRoomInfo(roomInfo); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_LIST_TYPE, - ResUtil.getString(R.string.avroom_presenter_avroompresenter_01) + roomInfo.getRoomTypeLable()); initAnotherPKData(); mAvRoomModel.enterRoom(roomInfo.getRoomId(), 3, fromType, fromNick, fromUid) .flatMap(this::dealServerMicInfo) @@ -457,7 +453,7 @@ public class AvRoomPresenter extends BaseMvpPresenter { AvRoomModel.get().getFirstCharge() .compose(bindToLifecycle()) .subscribe(firstChargeInfo -> { - if (getMvpView() != null && firstChargeInfo.getNeedToShow()) { + if (getMvpView() != null && firstChargeInfo.getNeedToShow()) { getMvpView().showFirstChargeDialog(firstChargeInfo); } }); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomSettingPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomSettingPresenter.java index 2744abb2a..43d221665 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomSettingPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomSettingPresenter.java @@ -3,7 +3,6 @@ package com.yizhuan.erban.avroom.presenter; import android.annotation.SuppressLint; import android.os.Handler; -import com.yizhuan.erban.R; import com.yizhuan.erban.avroom.view.IRoomSettingView; import com.yizhuan.erban.base.BaseMvpPresenter; import com.yizhuan.xchat_android_core.auth.AuthModel; @@ -17,13 +16,10 @@ import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; import com.yizhuan.xchat_android_core.room.model.MicQueueModel; import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.utils.net.BeanObserver; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; -import com.yizhuan.xchat_android_library.utils.ResUtil; import java.util.List; @@ -173,8 +169,6 @@ public class RoomSettingPresenter extends BaseMvpPresenter { if (mMvpView != null) mMvpView.leaveModeOpenSuccess(); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_OPEN_LEAVE_MODE, - ResUtil.getString(R.string.avroom_presenter_roomsettingpresenter_01)); updateRoomOwnerMic(); } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardListAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardListAdapter.java index 81871dfdd..be6c2834b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardListAdapter.java @@ -13,8 +13,6 @@ import com.yizhuan.erban.base.list.BaseViewHolder; import com.yizhuan.erban.base.list.CommonAdapter; import com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType; import com.yizhuan.xchat_android_core.room.recommendpos.bean.RecommendCard; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.TimeUtils; @@ -61,9 +59,8 @@ public class RecommendCardListAdapter extends CommonAdapter{ - StatisticManager.Instance().onEvent(StatisticsProtocol.h5_recommend_used, ResUtil.getString(R.string.avroom_recommendcard_recommendcardlistadapter_05)); - UIHelper.showRecommendPosH5(context); + stv_card_op.setOnClickListener(v -> { + UIHelper.showRecommendPosH5(context); }); } else if (cardType == RcmdCardType.USING) { holder.setBackgroundRes(R.id.scl_container, R.drawable.bg_recommend_card_vaild); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt index 67a2eff54..bf579475b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageSendDialog.kt @@ -8,7 +8,6 @@ import android.text.TextWatcher import android.view.KeyEvent import android.view.View import android.view.WindowManager -import com.umeng.commonsdk.statistics.common.DeviceConfig import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseDialog import com.yizhuan.erban.common.widget.dialog.DialogManager @@ -28,11 +27,10 @@ import com.yizhuan.xchat_android_core.manager.AvRoomDataManager import com.yizhuan.xchat_android_core.pay.PayModel import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent import com.yizhuan.xchat_android_core.redpackage.* -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_core.user.UserModel import com.yizhuan.xchat_android_core.utils.toIntOrDef import com.yizhuan.xchat_android_library.annatation.ActLayoutRes +import com.yizhuan.xchat_android_library.common.util.DeviceUtil import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil import com.yizhuan.xchat_android_library.utils.CommonUtils import com.yizhuan.xchat_android_library.utils.ResUtil @@ -129,7 +127,7 @@ class RedPackageSendDialog : BaseDialog(), GridPass CommonWebViewActivity.start( context, UriProvider.getOfficialPay( 4, - DeviceConfig.getDeviceId(context) + DeviceUtil.getDeviceId(context) ) ) } @@ -237,8 +235,6 @@ class RedPackageSendDialog : BaseDialog(), GridPass SingleToastUtil.showToast("發送成功") passWordFragment?.dismissAllowingStateLoss() dismissAllowingStateLoss() - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_SENDHONGBAO_SUCCESS, - "發紅包成功") } } } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/BottomView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/BottomView.java index 123d346b8..1756010f1 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/BottomView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/BottomView.java @@ -36,15 +36,12 @@ import com.yizhuan.xchat_android_core.manager.IMMessageManager; 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.bean.RoomModeType; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; 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.SharedPreferenceUtils; import com.yizhuan.xchat_android_core.utils.StringExtensionKt; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -334,8 +331,6 @@ public class BottomView extends FrameLayout implements View.OnClickListener { break; case R.id.icon_room_vip: VipMainActivity.start(getContext()); - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_VIP_ENTRANCE_ROOM_CLICK, ResUtil.getString(R.string.avroom_widget_bottomview_01)); break; default: break; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java index 1fecafb37..69b38ad88 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java @@ -162,8 +162,6 @@ import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; import com.yizhuan.xchat_android_core.room.queuing_mic.attachment.QueuingMicAttachment; import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfo; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; @@ -1045,8 +1043,6 @@ public class MessageView extends FrameLayout { builder.append(" 去參加!", new OriginalDrawStatusClickSpan(Color.parseColor("#FFBC51")) { @Override public void onClick(@NonNull View widget) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_TREASURE_ELF_SCREEN_ENTRANCE_CLICK, "奪寶精靈公屏入口點擊"); - HomeFairyActivity.start(mContext); } }); @@ -1464,7 +1460,6 @@ public class MessageView extends FrameLayout { @Override public void onClick(@NonNull View widget) { if (onClick != null) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_FOLLOW_CHAT_CLICK, ResUtil.getString(R.string.avroom_widget_messageview_040)); onClick.onFollowClick(position); } } @@ -2666,7 +2661,6 @@ public class MessageView extends FrameLayout { new OriginalDrawStatusClickSpan() { @Override public void onClick(@NonNull View view) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_WELCOME_HIM, ResUtil.getString(R.string.avroom_widget_messageview_0157)); ExtensionUtil.setWelcomeLocal(chatRoomMessage, true); mMessageAdapter.notifyItemChanged(position); long targetUid = JavaUtil.str2long(chatRoomMessage.getFromAccount()); @@ -2817,9 +2811,6 @@ public class MessageView extends FrameLayout { return; } - StatisticManager.Instance().onEvent( - StatisticsProtocol.EVENT_ROOM_FOLLOW_HIM, "關註TA"); - welcomeInfo.setConnecting(true); //關註 PraiseModel.get().praise(JavaUtil.str2long(chatRoomMessage.getFromAccount()), true) diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java index e7abd4013..9d6b34b67 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java @@ -1,5 +1,15 @@ package com.yizhuan.erban.base; +import static com.yizhuan.xchat_android_core.Constants.DEBUG_MAX_UID; +import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; +import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_OPENNOBLE; +import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_RENEWNOBLE; +import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; +import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; +import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_USER_ALL_UPGRADE; +import static com.yizhuan.xchat_android_library.utils.UIUtils.getActivityByContext; + import android.annotation.SuppressLint; import android.app.ActivityManager; import android.content.ComponentName; @@ -38,7 +48,6 @@ import com.readystatesoftware.systembartint.SystemBarTintManager; import com.tbruyelle.rxpermissions2.RxPermissions; import com.trello.rxlifecycle3.android.ActivityEvent; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.umeng.commonsdk.statistics.common.DeviceConfig; import com.yizhuan.erban.NimMiddleActivity; import com.yizhuan.erban.R; import com.yizhuan.erban.application.IReportConstants; @@ -85,11 +94,10 @@ import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo; 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.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_core.vip.VipMessageInfo; +import com.yizhuan.xchat_android_library.common.util.DeviceUtil; import com.yizhuan.xchat_android_library.rxbus.RxBus; import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; import com.yizhuan.xchat_android_library.utils.NetworkUtils; @@ -114,22 +122,12 @@ import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; -import static com.yizhuan.xchat_android_core.Constants.DEBUG_MAX_UID; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_OPENNOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_RENEWNOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_USER_ALL_UPGRADE; -import static com.yizhuan.xchat_android_library.utils.UIUtils.getActivityByContext; - /** * @author alvin hwang */ public abstract class BaseActivity extends RxAppCompatActivity - implements IDataStatus, DialogManagerInterface{ + implements IDataStatus, DialogManagerInterface { /** * -------------------------------------------------- @@ -485,7 +483,6 @@ public abstract class BaseActivity extends RxAppCompatActivity @Override protected void onResume() { super.onResume(); - StatisticManager.Instance().onResume(this); //GlideApp.with(this).resumeRequests(); RxBus.get().toFlowable(String.class) .compose(bindUntilEvent(ActivityEvent.PAUSE)) @@ -514,8 +511,6 @@ public abstract class BaseActivity extends RxAppCompatActivity @Override protected void onPause() { super.onPause(); - //remove connective changed broadcast receiver - StatisticManager.Instance().onPause(this); } protected boolean checkActivityValid() { @@ -1005,13 +1000,13 @@ public abstract class BaseActivity extends RxAppCompatActivity } map.put(IReportConstants.MODULE, IReportConstants.PEKO_PAY); ReportManager.get().reportEvent(IReportConstants.PAYPAGE_SHOW, map); - if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) { + if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) { ChargeActivity.start(context); - }else { + } else { CommonWebViewActivity.start( context, UriProvider.getOfficialPay( 4, - DeviceConfig.getDeviceId(context) + DeviceUtil.getDeviceId(context) ) ); } diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java index 395baa9d8..bef96823a 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java +++ b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java @@ -1,12 +1,10 @@ package com.yizhuan.erban.bills.activities; import android.annotation.SuppressLint; -import android.content.Intent; import android.text.TextUtils; import android.view.View; import android.widget.TextView; -import com.umeng.commonsdk.statistics.common.DeviceConfig; import com.yizhuan.erban.R; import com.yizhuan.erban.base.TitleBar; import com.yizhuan.erban.bills.adapter.GiftExpendAdapter; @@ -23,6 +21,7 @@ import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; import com.yizhuan.xchat_android_core.pay.PayModel; import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.yizhuan.xchat_android_library.common.util.DeviceUtil; import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -182,7 +181,7 @@ public class BillGiftExpendActivity extends BillBaseActivity CommonWebViewActivity.start( mActivity, UriProvider.getOfficialPay( 4, - DeviceConfig.getDeviceId(mActivity) + DeviceUtil.getDeviceId(mActivity) ) ); } diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java index 2af919d0e..d192dfbdc 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java +++ b/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java @@ -7,7 +7,6 @@ import android.text.TextUtils; import android.view.View; import android.widget.ImageView; -import com.umeng.commonsdk.statistics.common.DeviceConfig; import com.yizhuan.erban.R; import com.yizhuan.erban.base.TitleBar; import com.yizhuan.erban.bills.adapter.RedBagBillsAdapter; @@ -22,6 +21,7 @@ import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; import com.yizhuan.xchat_android_core.bills.bean.RedBagInfo; import com.yizhuan.xchat_android_core.bills.bean.RedBagListInfo; import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.yizhuan.xchat_android_library.common.util.DeviceUtil; import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -68,7 +68,7 @@ public class RedBagBillsActivity extends BillBaseActivity CommonWebViewActivity.start( context, UriProvider.getOfficialPay( 4, - DeviceConfig.getDeviceId(context) + DeviceUtil.getDeviceId(context) ) ); } diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java index e847c3259..4253a5729 100644 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java +++ b/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java @@ -10,7 +10,6 @@ import android.widget.TextView; import com.jzxiang.pickerview.TimePickerDialog; import com.jzxiang.pickerview.data.Type; import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.umeng.commonsdk.statistics.common.DeviceConfig; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseBindingActivity; import com.yizhuan.erban.base.TitleBar; @@ -23,6 +22,7 @@ import com.yizhuan.erban.ui.webview.CommonWebViewActivity; import com.yizhuan.xchat_android_core.Constants; import com.yizhuan.xchat_android_core.UriProvider; import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.yizhuan.xchat_android_library.common.util.DeviceUtil; import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.TimeUtils; @@ -83,7 +83,7 @@ public class WithdrawBillsActivity extends BaseBindingActivity(), CommonWebViewActivity.start( context, UriProvider.getOfficialPay( 4, - DeviceConfig.getDeviceId(context) + DeviceUtil.getDeviceId(context) ) ) } diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java index ec98c4089..f1eb44b17 100644 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java +++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java @@ -24,6 +24,7 @@ import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseMvpActivity; import com.yizhuan.erban.base.TitleBar; +import com.yizhuan.erban.common.util.Utils; import com.yizhuan.erban.common.widget.CircleImageView; import com.yizhuan.erban.constants.BundleKeys; import com.yizhuan.erban.family.presenter.FamilyHomePresenter; @@ -42,7 +43,6 @@ import com.yizhuan.erban.team.view.NimTeamMessageActivity; import com.yizhuan.erban.ui.user.activity.UserInfoActivity; import com.yizhuan.erban.ui.webview.CommonWebViewActivity; import com.yizhuan.erban.ui.widget.ShareDialog; -import com.yizhuan.erban.common.util.Utils; import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; import com.yizhuan.erban.ui.widget.recyclerview.layoutmanager.FullyLinearLayoutManager; import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; @@ -53,15 +53,12 @@ import com.yizhuan.xchat_android_core.family.model.FamilyModel; import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; import com.yizhuan.xchat_android_core.share.ShareModel; import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.FormatUtils; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import com.yizhuan.xchat_android_library.utils.log.MLog; import com.yizhuan.xchat_android_library.widget.DrawableCenterTextView; @@ -503,10 +500,6 @@ public class FamilyHomeActivity extends BaseMvpActivity { HomeRoomInfo fansRoomListBean = (HomeRoomInfo) adapter.getItem(position); if (view.getId() == R.id.cl_root) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ME_INTO_FOLLOW_ROOM_CLICK, ResUtil.getString(R.string.home_activity_collectionroomactivity_02)); AVRoomActivity.start(CollectionRoomActivity.this, fansRoomListBean.getRoomUid()); } }); diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java index 7c12b1025..62d635a34 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java @@ -12,10 +12,7 @@ import com.yizhuan.erban.common.widget.CircleImageView; import com.yizhuan.erban.ui.user.activity.UserInfoActivity; import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2; import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_library.utils.ResUtil; public class HomeConcernsAdapter extends BaseQuickAdapter { @@ -45,8 +42,6 @@ public class HomeConcernsAdapter extends BaseQuickAdapter 首页热门adapter

@@ -46,7 +43,6 @@ public class HomeRoomFragmentAdapter extends BaseMultiItemQuickAdapter { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_TJ_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_homeroomfragmentadapter_01)); AVRoomActivity.startForFromType(mContext, item.getRoomUid(), AVRoomActivity.FROM_TYPE_RECOMMEND); }); helper.setText(R.id.tv_online_number, item.getOnlineNum() + "") diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeSingleAnchorAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeSingleAnchorAdapter.kt index d2f703dbb..5fe023dca 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeSingleAnchorAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeSingleAnchorAdapter.kt @@ -12,10 +12,7 @@ import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 import com.yizhuan.erban.ui.utils.load import com.yizhuan.erban.ui.utils.loadFromAssets import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_core.utils.TextUtils -import com.yizhuan.xchat_android_library.utils.ResUtil /** * create by lvzebiao @2019/11/13 @@ -49,8 +46,6 @@ class HomeSingleAnchorAdapter : if (!TextUtils.isEmptyText(item.roomDesc)) item.roomDesc else "" ) helper.itemView.setOnClickListener { - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_RQZB_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_homesingleanchoradapter_01)) AVRoomActivity.startForFromType( mContext, item.uid, diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeTopAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeTopAdapter.java index ed328916d..5bff57bce 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeTopAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeTopAdapter.java @@ -1,7 +1,5 @@ package com.yizhuan.erban.home.adapter; -import static com.umeng.commonsdk.stateless.UMSLEnvelopeBuild.mContext; - import android.text.TextUtils; import android.view.View; import android.widget.ImageView; @@ -10,6 +8,7 @@ import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.yizhuan.erban.ui.utils.ImageLoadUtils; import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; +import com.yizhuan.xchat_android_library.common.application.BaseApp; import com.zhpan.bannerview.BaseBannerAdapter; import com.zhpan.bannerview.BaseViewHolder; @@ -51,7 +50,7 @@ public class HomeTopAdapter extends BaseBannerAdapter { if (!TextUtils.isEmpty(item.getAvatar())) { ImageLoadUtils.loadAvatarBig(item.getAvatar(), ivCover, R.drawable.default_cover); } else { - GlideApp.with(mContext) + GlideApp.with(BaseApp.getContext()) .load(R.drawable.default_cover) .placeholder(R.drawable.default_cover) .into(ivCover); diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/MeCenterAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/MeCenterAdapter.kt index 02c9b16a5..d247b9f66 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/MeCenterAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/MeCenterAdapter.kt @@ -7,8 +7,6 @@ import com.yizhuan.erban.R import com.yizhuan.erban.ui.im.RouterHandler import com.yizhuan.erban.ui.utils.load import com.yizhuan.xchat_android_core.room.bean.MeCenterInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol class MeCenterAdapter : @@ -22,12 +20,6 @@ class MeCenterAdapter : helper.getView(R.id.iv_new).load(item.centerBadge) helper.itemView.setOnClickListener { RouterHandler.handle(mContext, item.skipType, item.centerUrl) - StatisticManager.Instance() - .onEvent( - StatisticsProtocol.EVENT_USERCENTER_FUNCTION_CLIC, - mContext.getString(R.string.me_click_my_center), - mapOf("function_name" to item.centerName) - ) } } diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/MoreSingleAnchorAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/MoreSingleAnchorAdapter.kt index 8cd66ad27..8eda8a478 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/MoreSingleAnchorAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/MoreSingleAnchorAdapter.kt @@ -10,10 +10,7 @@ import com.yizhuan.erban.avroom.activity.AVRoomActivity import com.yizhuan.erban.ui.utils.load import com.yizhuan.erban.ui.utils.loadFromAssets import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_core.utils.TextUtils -import com.yizhuan.xchat_android_library.utils.ResUtil /** * create by lvzebiao @2019/11/13 @@ -44,8 +41,6 @@ class MoreSingleAnchorAdapter : .load(item.avatar, 12f, R.drawable.default_cover) helper.itemView.setOnClickListener { - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_ZB_TAB_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_moresingleanchoradapter_01)) AVRoomActivity.start(mContext, item.uid) } } diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java index 30100b3eb..a1c1f52f7 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomActAdapter.java @@ -1,7 +1,6 @@ package com.yizhuan.erban.home.adapter; import android.content.Context; -import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,9 +17,6 @@ import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter; import com.yizhuan.erban.utils.CommonJumpHelper; import com.yizhuan.xchat_android_core.home.bean.BannerInfo; import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import java.util.List; @@ -67,11 +63,7 @@ public class RoomActAdapter extends StaticPagerAdapter { } else if (bannerInfo.isRadish()) { PullRadishActivity.start(mContext); } else { - StatisticManager.Instance().onEvent(StatisticsProtocol.mp_room_activity, ResUtil.getString(R.string.home_adapter_roomactadapter_01)); AvRoomModel.get().activityClickLog("2", actId).subscribe(); - if (!TextUtils.isEmpty(actId) && "19".equals(actId)) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_RECOMMEND_CLICK, ResUtil.getString(R.string.home_adapter_roomactadapter_02)); - } if (bannerInfo.getSkipType() == 3 && bannerInfo.getShowType() != 1) { if (listener != null) { listener.onWebClick(bannerInfo.getSkipUri()); @@ -79,15 +71,6 @@ public class RoomActAdapter extends StaticPagerAdapter { } else { CommonJumpHelper.bannerJump(mContext, bannerInfo); } - //新埋点 - String actName = bannerInfo.getBannerName(); - if (actName == null) { - actName = ""; - } - - StatisticManager.Instance().onEvent( - StatisticsProtocol.EVENT_ROOM_ACTIVITY_ENTRANCE_B, - ResUtil.getString(R.string.home_adapter_roomactadapter_03) + actName); } }); return view; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomGameAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomGameAdapter.kt index eb37639fd..d265b964a 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomGameAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomGameAdapter.kt @@ -12,8 +12,6 @@ import com.yizhuan.erban.R import com.yizhuan.erban.avroom.activity.AVRoomActivity import com.yizhuan.erban.ui.utils.load import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_library.utils.ResUtil @@ -25,8 +23,6 @@ class RoomGameAdapter : BaseQuickAdapter(R.layout. getView(R.id.iv_room_image).load(item.avatar) setText(R.id.tv_room_title, item.title) itemView.setOnClickListener { - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_MINI_GAME_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_roomgameadapter_01)) AVRoomActivity.start(mContext, item.uid) } val tvRoomGame = helper.getView(R.id.tv_room_game) diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomHotAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomHotAdapter.kt index 26ce69e62..a72f1e936 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomHotAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomHotAdapter.kt @@ -9,10 +9,7 @@ import com.yizhuan.erban.avroom.activity.AVRoomActivity import com.yizhuan.erban.home.helper.BannerHelper import com.yizhuan.erban.ui.utils.load import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_core.utils.TextUtils -import com.yizhuan.xchat_android_library.utils.ResUtil class RoomHotAdapter : BaseMultiItemQuickAdapter(null) { @@ -28,8 +25,6 @@ class RoomHotAdapter : BaseMultiItemQuickAdapter(n helper.itemView.setOnClickListener { AVRoomActivity.start(mContext, item.uid) - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_RM_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_roomhotadapter_01)) } helper.getView(R.id.iv_room_image).load(item.avatar) diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomLikeAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomLikeAdapter.kt index cb6e852e7..fa2039fa8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomLikeAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomLikeAdapter.kt @@ -9,10 +9,7 @@ import com.yizhuan.erban.avroom.activity.AVRoomActivity import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 import com.yizhuan.erban.ui.utils.load import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_core.utils.TextUtils -import com.yizhuan.xchat_android_library.utils.ResUtil class RoomLikeAdapter : BaseQuickAdapter(R.layout.item_room_like) { @@ -43,8 +40,6 @@ class RoomLikeAdapter : BaseQuickAdapter(R.layout. } helper.itemView.setOnClickListener { AVRoomActivity.start(mContext, item.roomUid) - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_SCFJ_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_roomlikeadapter_01)) } if (item.isValid) { helper.setGone(R.id.tv_online_number, true) diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt index 04d4f59bc..ff0f92ffb 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt @@ -13,7 +13,6 @@ import androidx.core.view.isVisible import androidx.databinding.DataBindingUtil import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels -import com.umeng.commonsdk.statistics.common.DeviceConfig import com.yizhuan.erban.R import com.yizhuan.erban.UIHelper import com.yizhuan.erban.application.IReportConstants @@ -57,16 +56,14 @@ import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent import com.yizhuan.xchat_android_core.room.bean.MeCenterInfo import com.yizhuan.xchat_android_core.room.bean.RoomInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol 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.LoginUserInfoUpdateEvent import com.yizhuan.xchat_android_core.utils.Logger import com.yizhuan.xchat_android_core.utils.StarUtils +import com.yizhuan.xchat_android_library.common.util.DeviceUtil import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil import com.yizhuan.xchat_android_library.utils.FormatUtils -import com.yizhuan.xchat_android_library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -123,12 +120,7 @@ class MeFragment : BaseFragment(), View.OnClickListener { BannerHelper.setBanner( mBinding.rollView, it ) { _, bannerInfo -> - StatisticManager.Instance() - .onEvent( - StatisticsProtocol.EVENT_USERCENTER_BANNER_CLICK, - getString(R.string.me_Individual_center_banner_click), - mapOf("banner_id" to bannerInfo.bannerId.toString()) - ) + } } @@ -139,23 +131,12 @@ class MeFragment : BaseFragment(), View.OnClickListener { homeViewModel.pickRoomLiveData.observe(viewLifecycleOwner) { it?.let { AVRoomActivity.start(mContext, it.uid) - StatisticManager.Instance() - .onEvent( - StatisticsProtocol.EVENT_USERCENTER_QUICK_ENTRY_CLICK, - getString(R.string.me_personal_center_quick_access_room), - mapOf("room_id" to it.erbanNo.toString()) - ) } } homeViewModel.openGameRoomLiveData.observe(viewLifecycleOwner) { it?.let { OpenRoomHelper.openRoom(mContext as BaseActivity, RoomInfo.ROOMTYPE_GAME, it) - StatisticManager.Instance() - .onEvent( - StatisticsProtocol.EVENT_USERCENTER_QUICK_ENTRYSUCCESS_CLICK, - getString(R.string.me_personal_center_fast_into) - ) } } @@ -446,7 +427,7 @@ class MeFragment : BaseFragment(), View.OnClickListener { CommonWebViewActivity.start( context, UriProvider.getOfficialPay( 4, - DeviceConfig.getDeviceId(context) + DeviceUtil.getDeviceId(context) ) ) } @@ -464,12 +445,6 @@ class MeFragment : BaseFragment(), View.OnClickListener { ReportManager.get().reportEvent(IReportConstants.PAYPAGE_SHOW, map) } R.id.ll_room -> { - //我的房间,开房 - StatisticManager.Instance() - .onEvent( - StatisticsProtocol.EVENT_ME_INTO_MY_ROOM_CLICK, - ResUtil.getString(R.string.home_fragment_mefragment_01) - ) OpenRoomHelper.openRoom(context as BaseActivity?) } R.id.ll_gain -> { diff --git a/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt b/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt index 15b8e4ac2..17cd45966 100644 --- a/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt +++ b/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt @@ -28,13 +28,10 @@ import com.yizhuan.erban.ui.user.decorationsend.UserInfoSkillDecoration import com.yizhuan.erban.ui.utils.load import com.yizhuan.erban.ui.utils.loadAvatar import com.yizhuan.xchat_android_core.room.bean.AnchorInfo -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_core.user.bean.UserInfo import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity import com.yizhuan.xchat_android_core.utils.subAndReplaceDot import com.yizhuan.xchat_android_library.utils.ListUtils -import com.yizhuan.xchat_android_library.utils.ResUtil import com.yizhuan.xchat_android_library.utils.SingleToastUtil import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -107,16 +104,8 @@ class AnchorCardView @JvmOverloads constructor( ) isVisible = false stopAudio() - StatisticManager.Instance() - .onEvent( - StatisticsProtocol.EVENT_PERSONALSHOW_TOP_CARD_ROOM_CLICK, - ResUtil.getString(R.string.home_widget_anchorcardview_01), - mapOf("room_id" to it.erbanNo.toString()) - ) } intervalRange() - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_PERSONALSHOW_TOP_CARD_SHOW, ResUtil.getString(R.string.home_widget_anchorcardview_02)) } ?: run { isVisible = false } @@ -228,9 +217,6 @@ class AnchorCardView @JvmOverloads constructor( stopAudio() } }) - - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_PERSONALSHOW_TOP_CARD_VOICE_CLICK, "個播展示卡片播放語音點擊") } private fun stopAudio() { diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java b/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java index a60780ae8..0eadcdccc 100644 --- a/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java +++ b/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java @@ -14,7 +14,6 @@ import com.netease.nimlib.sdk.team.TeamService; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.team.model.TeamMember; import com.trello.rxlifecycle3.android.ActivityEvent; -import com.umeng.commonsdk.statistics.common.DeviceConfig; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseBindingActivity; import com.yizhuan.erban.base.TitleBar; @@ -36,6 +35,7 @@ import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; +import com.yizhuan.xchat_android_library.common.util.DeviceUtil; import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; import com.yizhuan.xchat_android_library.utils.JavaUtil; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -279,7 +279,7 @@ public class LuckyMoneyCreationActivity extends BaseBindingActivity { - OaidUtil.setOaid(oaid); + if(!TextUtils.isEmpty(DeviceUtil.getAndroidID())){ + OaidUtil.setOaid(DeviceUtil.getAndroidID()); if (first) ChannelPageModel.get().checkAd(); - }); + } mBinding.tvSkip.setVisibility(View.VISIBLE); // 不过期的，并且已经下载出来图片的闪屏页数据 diff --git a/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java b/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java index cd03d487f..516750a32 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java +++ b/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java @@ -27,8 +27,6 @@ import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import com.yizhuan.xchat_android_core.UriProvider; import com.yizhuan.xchat_android_core.radish.RadishWalletInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -42,7 +40,6 @@ public class RadishRecordActivity extends BaseMvpActivity 0) { setGoldPool((int) count); toast(ResUtil.getString(R.string.radish_signin_signinactivity_014) + count + ResUtil.getString(R.string.radish_signin_signinactivity_015)); @@ -666,7 +661,6 @@ public class SignInActivity extends BaseMvpActivity() { @@ -176,8 +168,6 @@ public class SignInDialog extends AppCompatDialog { @Override public void onSuccess(SignInfo signInfo) { long addGoldNum = signInfo.getSignGoldNum(); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SIGN_SUCCESS, - ResUtil.getString(R.string.signin_view_signindialog_04)); SingleToastUtil.showToast(ResUtil.getString(R.string.signin_view_signindialog_05) + addGoldNum + ResUtil.getString(R.string.signin_view_signindialog_06)); //启动播放动画 long newPoolNumber = addGoldNum + detailInfo.getShowGoldNum(); diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java b/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java index 0df026a30..896874fb6 100644 --- a/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java +++ b/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java @@ -24,8 +24,6 @@ import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import com.yizhuan.xchat_android_core.radish.task.bean.PrizeAnim; import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -57,8 +55,6 @@ public class TaskCenterActivity extends BaseMvpActivity() { @@ -143,15 +130,6 @@ public class TaskCenterFragment extends BaseMvpFragment= num) { return true diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java index c6509979d..19e18cc2a 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java @@ -6,7 +6,6 @@ import android.content.Intent; import android.os.Bundle; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.umeng.commonsdk.statistics.common.DeviceConfig; import com.yizhuan.erban.R; import com.yizhuan.erban.UIHelper; import com.yizhuan.erban.audio.VoiceMatchActivity; @@ -55,11 +54,10 @@ import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; 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.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.net.BeanObserver; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_core.withdraw.WithdrawModel; +import com.yizhuan.xchat_android_library.common.util.DeviceUtil; import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; import com.yizhuan.xchat_android_library.utils.JavaUtil; @@ -104,7 +102,7 @@ public class RouterHandler { CommonWebViewActivity.start( context, UriProvider.getOfficialPay( 4, - DeviceConfig.getDeviceId(context) + DeviceUtil.getDeviceId(context) ) ); } @@ -231,7 +229,6 @@ public class RouterHandler { return false; } dmi = (DialogManagerInterface) context; - StatisticManager.Instance().onEvent(StatisticsProtocol.game_homepage_matchsex, ResUtil.getString(R.string.ui_im_routerhandler_01)); if (AvRoomDataManager.get().isRoomOwner() && AvRoomDataManager.get().isCpRoom() && DemoCache.readBoolean(IS_FIRST, true)) { @@ -243,9 +240,6 @@ public class RouterHandler { } break; case RouterType.CITY_MATCHING: -// StatisticManager.Instance().onEvent(StatisticsProtocol.game_homepage_player, ResUtil.getString(R.string.ui_im_routerhandler_03)); -// context.startActivity(new Intent(context, UserMatchActivity.class)); - SingleToastUtil.showToast(ResUtil.getString(R.string.ui_im_routerhandler_04)); break; case RouterType.GAME_MATCHING: @@ -284,7 +278,6 @@ public class RouterHandler { break; case RouterType.MY_ROOM: //我的房间,开房 - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ME_INTO_MY_ROOM_CLICK, ResUtil.getString(R.string.ui_im_routerhandler_05)); OpenRoomHelper.openRoom((BaseActivity) context); break; case RouterType.COLLECTION_ROOM: diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java b/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java index 51594e236..f47461722 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java @@ -7,9 +7,6 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.ui.widget.higuide.TuTuGuideHelper; import com.yizhuan.xchat_android_core.im.chatterbox.ChatterBoxHelper; import com.yizhuan.xchat_android_core.im.chatterbox.HideInputEvent; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; -import com.yizhuan.xchat_android_library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; @@ -28,8 +25,6 @@ public class ChatterBoxAction extends BaseAction { if (currentClick - lastClick > 1000L) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MESSAGE_START_CHATTER_BOX, ResUtil.getString(R.string.im_actions_chatterboxaction_01)); - EventBus.getDefault().post(new HideInputEvent()); lastClick = currentClick; diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftAction.java b/app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftAction.java index 462a389bd..2c3ec06af 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftAction.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftAction.java @@ -11,8 +11,6 @@ import com.yizhuan.xchat_android_core.gift.GiftModel; import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox; import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.net.VipLevelNotEnoughException; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -68,8 +66,6 @@ public class GiftAction extends BaseAction implements GiftDialog.OnGiftDialogBtn // 手动更新送礼物的消息 MessageListPanelHelper.getInstance().notifyAddMessage(imMessage); if (callback != null) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_PRIVATECHAT_SENDGIFT, - ResUtil.getString(R.string.im_actions_giftaction_04)); callback.onSuccess(); } }); diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MVHChatterBoxStart.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MVHChatterBoxStart.java index 711555d36..2da88a640 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MVHChatterBoxStart.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MVHChatterBoxStart.java @@ -20,8 +20,6 @@ import com.yizhuan.xchat_android_core.im.chatterbox.TopicBoxItemInfo; import com.yizhuan.xchat_android_core.im.custom.bean.ChatterBoxAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.DiceThrowAttachment; import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.utils.ResUtil; import java.util.HashMap; @@ -121,11 +119,6 @@ public class MVHChatterBoxStart extends MsgViewHolderBase implements View.OnClic if (tvThrowDice.isEnabled()) { - if (isFromHome) - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MESSAGE_CHATTER_BOX_POINTS, ResUtil.getString(R.string.im_chat_mvhchatterboxstart_04)); - else - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_HOME_CHAT_NUMBER_OF_POINTS, ResUtil.getString(R.string.im_chat_mvhchatterboxstart_05)); - } tvThrowDice.setEnabled(false); diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderAudioParty.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderAudioParty.java index d15908398..94af567cc 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderAudioParty.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderAudioParty.java @@ -13,8 +13,6 @@ import com.yizhuan.erban.avroom.activity.AVRoomActivity; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment; import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldHelper; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; @@ -74,11 +72,6 @@ public class MsgViewHolderAudioParty extends MsgViewHolderBase implements View.O SingleToastUtil.showToast(ResUtil.getString(R.string.im_chat_msgviewholderaudioparty_01)); return; } - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MINI_WORLD_JOIN_PARTY, ResUtil.getString(R.string.im_chat_msgviewholderaudioparty_02)); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_PAGE_ENTER_PARTY, - ResUtil.getString(R.string.im_chat_msgviewholderaudioparty_03)); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_PAGE_ENTER_PARTY_B, - ResUtil.getString(R.string.im_chat_msgviewholderaudioparty_04) + attachment.getWorldId()); MiniWorldHelper.report(attachment.getWorldId(), MiniWorldHelper.TYPE_AUDIO_PARTY_JOIN); AVRoomActivity.start(v.getContext(), attachment.getRoomUid()); } diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java index 090ba88db..ee9d95efa 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java @@ -66,8 +66,6 @@ import com.yizhuan.xchat_android_core.im.chatterbox.HideInputEvent; import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment; import com.yizhuan.xchat_android_core.room.event.MessageSizeEvent; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; import com.yizhuan.xchat_android_library.utils.config.BasicConfig; @@ -359,8 +357,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi NIMClient.getService(MsgService.class).sendMessage(message, false).setCallback(new RequestCallback() { @Override public void onSuccess(Void param) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_PRIVATECHAT_CAHT, - ResUtil.getString(R.string.im_fragment_messagefragment_01)); + } @Override diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt index 2126379ad..216f2c0e3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendFragmentCpDelegate.kt @@ -2,7 +2,6 @@ package com.yizhuan.erban.ui.im.friend import android.text.TextUtils import androidx.fragment.app.viewModels -import com.umeng.commonsdk.statistics.common.DeviceConfig import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseFragment import com.yizhuan.erban.common.widget.dialog.DialogManager @@ -15,6 +14,7 @@ import com.yizhuan.xchat_android_core.Constants import com.yizhuan.xchat_android_core.UriProvider import com.yizhuan.xchat_android_core.relation.cp.CpInvitePageEntity import com.yizhuan.xchat_android_core.utils.toast +import com.yizhuan.xchat_android_library.common.util.DeviceUtil import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil class FriendFragmentCpDelegate(private val fragment: BaseFragment) { @@ -81,7 +81,7 @@ class FriendFragmentCpDelegate(private val fragment: BaseFragment) { CommonWebViewActivity.start( fragment.requireContext(), UriProvider.getOfficialPay( 4, - DeviceConfig.getDeviceId(fragment.requireContext()) + DeviceUtil.getDeviceId(fragment.requireContext()) ) ) } diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java index 407a682a0..ec30f0f01 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java @@ -46,8 +46,6 @@ import com.yizhuan.xchat_android_core.level.UserLevelVo; import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesInfo; import com.yizhuan.xchat_android_core.mentoring_relationship.event.GrabApprenticesDataEvent; import com.yizhuan.xchat_android_core.mentoring_relationship.model.MentoringRelationshipModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.AttentionModel; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; @@ -205,8 +203,6 @@ public class RecentListFragment extends BaseFragment { // 删除 item grabApprenticesInfoList.remove(item); // 点击抢徒弟按钮，打点 - StatisticManager.Instance().onEvent(StatisticsProtocol.NEWS_ROB, - ResUtil.getString(R.string.im_recent_recentlistfragment_01)); MentoringRelationshipModel.get() .grabApprentices(item.getUid()) .compose(bindUntilEvent(FragmentEvent.DESTROY)) @@ -214,8 +210,6 @@ public class RecentListFragment extends BaseFragment { if (throwable == null) { NimP2PMessageActivity.start(getContext(), s); // 抢徒弟成功，打点 - StatisticManager.Instance().onEvent(StatisticsProtocol.NEWS_ROB_SUCCESS, - ResUtil.getString(R.string.im_recent_recentlistfragment_02)); } else { toast(throwable.getMessage()); } @@ -234,7 +228,6 @@ public class RecentListFragment extends BaseFragment { SharedPreferenceUtils.put(share_pref_is_newbie_clicked, true);// 是否第一次点击发现萌新 ivRedPoint.setVisibility(View.GONE); RoomNewbieActivity.start(getActivity(), false); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_MESSAGE_FINDNEW_CLICK, ResUtil.getString(R.string.im_recent_recentlistfragment_03)); }); } @@ -298,8 +291,6 @@ public class RecentListFragment extends BaseFragment { } else { Team t = NimUIKit.getTeamProvider().getTeamById(recent.getContactId()); if (t != null && t.isMyTeam()) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_PAGE_ENTER_GROUP_CHAT, - ResUtil.getString(R.string.im_recent_recentlistfragment_04)); MiniWorldTeamMessageActivity.start(mContext, recent.getContactId(), true); } else { MiniWorldTeamMessageActivity.start(mContext, recent.getContactId(), false); @@ -368,9 +359,9 @@ public class RecentListFragment extends BaseFragment { @SuppressLint("CheckResult") private void loadAttentionList() { AttentionModel.get().getAttentionList( - AuthModel.get().getCurrentUid(), - 1, - 200) + AuthModel.get().getCurrentUid(), + 1, + 200) .flatMap(attentionInfos -> { if (attentionInfos != null) { Iterator iterator = attentionInfos.iterator(); diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt index e16e2ea84..8dabe4403 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt @@ -26,8 +26,6 @@ import com.yizhuan.xchat_android_core.DemoCache import com.yizhuan.xchat_android_core.auth.AuthModel import com.yizhuan.xchat_android_core.auth.event.LoginEvent import com.yizhuan.xchat_android_core.code.CodeType -import com.yizhuan.xchat_android_core.statistic.StatisticManager -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol import com.yizhuan.xchat_android_library.utils.ResUtil import io.reactivex.SingleObserver import io.reactivex.android.schedulers.AndroidSchedulers @@ -222,12 +220,6 @@ class LoginCodeActivity : BaseViewBindingActivity() { dealWithLoginError(e) } }) - StatisticManager.Instance().onEvent( - this, - StatisticsProtocol.EVENT_LOGIN_PHONE_CLICK, - ResUtil.getString(R.string.ui_login_logincodeactivity_03), - null - ) } /** diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java index beb23df20..a8a416c02 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java @@ -28,16 +28,11 @@ import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.initial.bean.InitInfo; import com.yizhuan.xchat_android_core.linked.LinkedModel; import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; 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.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.utils.ResUtil; import java.util.HashMap; -import java.util.Map; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; @@ -157,8 +152,6 @@ public class AddUserInfoFragment extends BaseFragment } break; case R.id.tv_random_nick: - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_INFORMATION_RANDOM_NAME, - ResUtil.getString(R.string.login_fragment_adduserinfofragment_06)); setRandomNick(); break; @@ -221,7 +214,6 @@ public class AddUserInfoFragment extends BaseFragment @Override public void onSuccess(UserInfo userInfo) { getDialogManager().dismissDialog(); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_COMPLETE, ResUtil.getString(R.string.login_fragment_adduserinfofragment_09)); ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_REGISTER); HashMap map = new HashMap<>(2); map.put(FirebaseAnalytics.Param.METHOD, finalChannel); @@ -236,14 +228,6 @@ public class AddUserInfoFragment extends BaseFragment toast(e.getMessage()); } }); - - Map attributes = new HashMap<>(4); - attributes.put("userUid", userInfo.getUid() + ""); - attributes.put("shareChannel", channel); - attributes.put("shareUid", uid); - attributes.put("roomUid", roomUid); - StatisticManager.Instance().onEvent(getContext(), - StatisticsProtocol.EVENT_LOGIN_REPARI_SUCCESS_CLICK, ResUtil.getString(R.string.login_fragment_adduserinfofragment_010), attributes); } @Override diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java b/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java index 0f4d9584b..e1dff2f17 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java @@ -13,8 +13,6 @@ import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.auth.exception.AccountCancelException; import com.yizhuan.xchat_android_core.auth.exception.BanAccountException; import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.net.rxnet.exception.ExceptionHandle; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -39,8 +37,6 @@ public class LogoutHelper { if (!TextUtils.isEmpty(msg)) { eventLabel.append(msg); } - // 2004可以完整写入 - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_LOGIN_FAILED_CLICK, eventLabel.toString()); } if (e instanceof BanAccountException) { BanAccountException exception = (BanAccountException) e; diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java b/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java index 9ac21ac51..bb24388e1 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java @@ -49,8 +49,6 @@ import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; import com.yizhuan.xchat_android_core.relation.cp.CpBindUnbindEvent; import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; @@ -311,8 +309,6 @@ public class SearchActivity extends BaseMvpActivity list = adapter.getData(); if (position >= 0 && position < list.size()) { String record = list.get(position); @@ -320,7 +316,6 @@ public class SearchActivity extends BaseMvpActivity list = adapter.getData(); if (position >= 0 && position < list.size()) { ImeUtil.hideIME(SearchActivity.this, tvSearch); @@ -360,7 +353,6 @@ public class SearchActivity extends BaseMvpActivity { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SEARCH_INTO_RESULT_ROOM_CLICK, ResUtil.getString(R.string.ui_search_searchadapter_01)); AVRoomActivity.start(mContext, item.getUid()); }); } diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/NoticeSettingActivity.java b/app/src/main/java/com/yizhuan/erban/ui/setting/NoticeSettingActivity.java index 6ec8e8712..e5c856b9c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/NoticeSettingActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/NoticeSettingActivity.java @@ -15,8 +15,6 @@ import com.yizhuan.erban.base.BaseViewBindingActivity; import com.yizhuan.erban.common.widget.TutuSwitchView; import com.yizhuan.erban.databinding.ActivityNoticeSettingBinding; import com.yizhuan.xchat_android_core.settings.SettingsModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.widget.IOSSwitchView; @@ -34,8 +32,6 @@ public class NoticeSettingActivity extends BaseViewBindingActivity() { diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java index ebd27715f..59b672fbf 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java @@ -78,8 +78,6 @@ import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.praise.PraiseModel; import com.yizhuan.xchat_android_core.praise.event.IsLikedEvent; import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserInfoUiMgr; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; @@ -289,26 +287,6 @@ public class UserInfoActivity extends BaseBindingActivity position) { JoinWorldInfo joinWorldInfo = list1.get(position); if (joinWorldInfo != null) { - String from = isOwner() ? ResUtil.getString(R.string.user_adapter_userdesadapter_06) : ResUtil.getString(R.string.user_adapter_userdesadapter_07); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_VIEW_WORLD_PAGE, - ResUtil.getString(R.string.user_adapter_userdesadapter_08) + from); TopicMainActivity.start(mContext, String.valueOf(joinWorldInfo.getWorldId())); } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java index 8f27a41fa..bc08be1ae 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java @@ -33,8 +33,6 @@ import com.yizhuan.erban.utils.TimeUiUtils; import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -154,11 +152,6 @@ public class UserInfoDynamicAdapter extends BaseQuickAdapter buttons, boolean isInRoom,GiftDialog.OnGiftDialogBtnClickListener listener) { + private UserInfoDialog(Context context, UserInfo userInfo, long uid, List buttons, boolean isInRoom, GiftDialog.OnGiftDialogBtnClickListener listener) { super(context, R.style.ErbanUserInfoDialog); this.context = context; this.uid = uid; @@ -208,7 +206,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe isInRoom, listener ); - new UserInfoDialog(context, userInfo, uid, list, isInRoom,listener).show(); + new UserInfoDialog(context, userInfo, uid, list, isInRoom, listener).show(); loadingDialog.dismiss(); }, throwable -> { SingleToastUtil.showToast(throwable.getMessage()); @@ -650,7 +648,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe } } - private void copyName(){ + private void copyName() { try { ClipboardManager cm = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); cm.setPrimaryClip(ClipData.newPlainText("text", String.valueOf(userInfo.getErbanNo()))); @@ -783,14 +781,11 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe dismiss(); break; case R.id.tv_report: - StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_report_click, getString(R.string.ui_widget_userinfodialog_010)); - UIHelper.showReportPage(context, uid, XChatConstants.REPORT_TYPE_USERCARD); dismiss(); break; case R.id.fl_avatar_layout: case R.id.user_info_page_btn: - StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_homepage_click, getString(R.string.ui_widget_userinfodialog_011)); UserInfoActivity.Companion.start(context, uid); dismiss(); break; @@ -803,7 +798,6 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe */ private void toAttent() { if (userInfo == null) return; - StatisticManager.Instance().onEvent(StatisticsProtocol.data_card_follow_click, getString(R.string.ui_widget_userinfodialog_012)); //资料卡片不允许取消关注 if (isAttention) { @@ -1055,7 +1049,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe if (isMySelf && isTargetOnMic) { buttonItems.add(createGiveGiftMicItem()); buttonItems.add(createDownMicItem()); - }else if(isMySelf){ + } else if (isMySelf) { buttonItems.add(createGiveGiftMicItem()); } return buttonItems; @@ -1102,10 +1096,6 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe GiftValueMrg.get().updateRoomGiftValue(roomGiftValue, true); //通知房间其他用户更新 GiftValueMrg.get().sendRoomGiftValueMsg(roomGiftValue); - - StatisticManager.Instance().onEvent( - StatisticsProtocol.EVENT_DATA_CARD_CLEAN_GIFTVALUE, - getString(R.string.ui_widget_userinfodialog_015)); } }); dismiss(); @@ -1221,7 +1211,6 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe private TextView createBanMicItem(int micPosition) { TextView textView = getTextView(getString(R.string.ui_widget_userinfodialog_019)); textView.setOnClickListener(v -> { - StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_close_mic_click, getString(R.string.ui_widget_userinfodialog_020)); final RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo; if (roomInfo == null) { @@ -1253,7 +1242,6 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe private TextView createLockMicItem(int micPosition) { TextView textView = getTextView(getString(R.string.ui_widget_userinfodialog_022)); textView.setOnClickListener(v -> { - StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_lock_mic_click, getString(R.string.ui_widget_userinfodialog_023)); final RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo; if (roomInfo == null) { @@ -1379,7 +1367,6 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe private TextView createKickMicItem() { TextView textView = getTextView(getString(R.string.ui_widget_userinfodialog_029)); textView.setOnClickListener(v -> { - StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_takeOut_mic_click, getString(R.string.ui_widget_userinfodialog_030)); if (SuperAdminUtil.isSuperAdmin()) { mSuperAdminModel.roomOperate(SuperAdminModel.TAKE_OUT_MIC, uid).subscribe(); kickDownMicCode(); diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java index f3d901a1e..98a8a4b0b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java @@ -18,10 +18,7 @@ import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelOneBinding; import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity; import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; import java.util.concurrent.TimeUnit; @@ -73,8 +70,6 @@ public class AllServiceGiftLevelOneDialog extends AllServiceGiftDialog { } else { AVRoomActivity.start(getContext(), dataBean.getRoomUid()); } - - StatisticManager.Instance().onEvent(StatisticsProtocol.FULL_GIFT_WATCHING, ResUtil.getString(R.string.widget_dialog_allservicegiftlevelonedialog_01)); }); Observable.timer((long) dataBean.getNotifyStaySecond(), TimeUnit.SECONDS) .subscribe(aLong -> { diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java index 27f6785c4..6bcfd720c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java @@ -19,10 +19,7 @@ import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelThreeBinding; import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity; import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; import java.util.concurrent.TimeUnit; @@ -77,8 +74,6 @@ public class AllServiceGiftLevelThreeDialog extends AllServiceGiftDialog { } else { AVRoomActivity.start(getContext(), dataBean.getRoomUid()); } - - StatisticManager.Instance().onEvent(StatisticsProtocol.FULL_GIFT_WATCHING, ResUtil.getString(R.string.widget_dialog_allservicegiftlevelthreedialog_01)); }); // 设置定时器 Observable.timer((long) dataBean.getNotifyStaySecond(), TimeUnit.SECONDS) diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java index e43f2614e..f0f00eda5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java @@ -19,10 +19,7 @@ import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelTwoBinding; import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity; import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; import java.util.concurrent.TimeUnit; @@ -56,7 +53,7 @@ public class AllServiceGiftLevelTwoDialog extends AllServiceGiftDialog { window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); WindowManager.LayoutParams windowParams = window.getAttributes(); windowParams.width = WindowManager.LayoutParams.MATCH_PARENT; - windowParams.height =WindowManager.LayoutParams.WRAP_CONTENT; + windowParams.height = WindowManager.LayoutParams.WRAP_CONTENT; windowParams.dimAmount = 0.0f; windowParams.gravity = Gravity.TOP; windowParams.x = 0; @@ -74,8 +71,6 @@ public class AllServiceGiftLevelTwoDialog extends AllServiceGiftDialog { } else { AVRoomActivity.start(getContext(), dataBean.getRoomUid()); } - - StatisticManager.Instance().onEvent(StatisticsProtocol.FULL_GIFT_WATCHING, ResUtil.getString(R.string.widget_dialog_allservicegiftleveltwodialog_01)); }); // 设置定时器 Observable.timer((long) (dataBean.getNotifyStaySecond()), TimeUnit.SECONDS) diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java index 35e124999..f52ddbe4c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java @@ -19,15 +19,13 @@ import androidx.viewpager.widget.ViewPager; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.common.util.Utils; +import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.vip.VipMainActivity; import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; import com.yizhuan.xchat_android_core.room.event.FaceIsReadyEvent; import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; import com.yizhuan.xchat_android_core.room.face.FaceInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.LogUtils; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -312,8 +310,6 @@ public class DynamicFaceDialog extends BottomSheetDialog } } else if (v.getId() == R.id.iv_open_noble) { VipMainActivity.start(context); - StatisticManager.Instance() - .onEvent(StatisticsProtocol.EVENT_VIP_ENTRANCE_FACE_CLICK, ResUtil.getString(R.string.widget_dynamicface_dynamicfacedialog_05)); } } diff --git a/app/src/main/java/com/yizhuan/erban/utils/DeviceUtil.kt b/app/src/main/java/com/yizhuan/erban/utils/DeviceUtil.kt deleted file mode 100644 index 0e629bc1a..000000000 --- a/app/src/main/java/com/yizhuan/erban/utils/DeviceUtil.kt +++ /dev/null @@ -1,118 +0,0 @@ -package com.yizhuan.erban.utils - -import android.annotation.SuppressLint -import android.os.Looper -import android.provider.Settings -import android.text.TextUtils -import androidx.annotation.WorkerThread -import com.google.android.gms.ads.identifier.AdvertisingIdClient -import com.yizhuan.xchat_android_library.common.application.BaseApp -import com.yizhuan.xchat_android_library.common.util.Logger -import com.yizhuan.xchat_android_library.common.util.SPUtils -import java.io.IOException - -/** - * create by wushaocheng 2023/2/15 - * 获取设备id - */ -object DeviceUtil { - - private const val TAG = "DeviceManager" - private const val ANDROID_ID_KEY = "android_id" - - @Volatile - private var ANDROID_ID = "" - - @Volatile - private var GAID = "" - - /** - * @return 获取系统id - */ - @SuppressLint("HardwareIds") - fun getAndroidID(): String { - if (!TextUtils.isEmpty(ANDROID_ID)) { - Logger.info(TAG, "getAndroidID from cache, ANDROID_ID=$ANDROID_ID") - return ANDROID_ID - } - ANDROID_ID = SPUtils.getString(ANDROID_ID_KEY, "") - if (!TextUtils.isEmpty(ANDROID_ID)) { - Logger.info(TAG, "getAndroidID from SP, ANDROID_ID=$ANDROID_ID") - return ANDROID_ID - } - ANDROID_ID = Settings.Secure.getString( - BaseApp.getContext().contentResolver, - Settings.Secure.ANDROID_ID - ) - Logger.info(TAG, "getAndroidID from system, ANDROID_ID=$ANDROID_ID") - SPUtils.putString(ANDROID_ID_KEY, ANDROID_ID) - return ANDROID_ID - } - - /** - * 请求广告id，注意调用该方法时只能运行在子线程中不能够用在UI线程中，跟设备是否有Google Play Service有关。 - */ - @WorkerThread - fun requestGAID() { - if (Looper.myLooper() == Looper.getMainLooper()) { - //避免在主线程中操作引起ANR问题 - Logger.warn( - TAG, - "requestGAID method must called on work thread instead of UI thread!!!" - ) - return - } - try { - //以下代码会阻塞当前线程，所以不能在UI线程中使用，避免出现ANR问题，参考：https://developers.google.com/android/reference/com/google/android/gms/ads/identifier/AdvertisingIdClient#public-static-advertisingidclient.info-getadvertisingidinfo-context-context - val info: AdvertisingIdClient.Info = - AdvertisingIdClient.getAdvertisingIdInfo( - BaseApp.getContext() - ) - val isLimitAdTrackingEnabled: Boolean = info.isLimitAdTrackingEnabled - Logger.info( - TAG, - "requestGAID isLimitAdTrackingEnabled=$isLimitAdTrackingEnabled" - ) - if (!isLimitAdTrackingEnabled) { - GAID = info.id.toString() - Logger.info(TAG, "requestGAID from system, GAID=$GAID") - } - } catch (e: IOException) { - Logger.error( - TAG, - "requestGAID IOException", - e - ) - } catch (e: IllegalStateException) { - Logger.error( - TAG, - "requestGAID IllegalStateException", - e - ) - } catch (e: com.google.android.gms.common.GooglePlayServicesNotAvailableException) { - Logger.error( - TAG, - "requestGAID GooglePlayServicesNotAvailableException", - e - ) - } catch (e: com.google.android.gms.common.GooglePlayServicesRepairableException) { - Logger.error( - TAG, - "requestGAID GooglePlayServicesRepairableException", - e - ) - } - } - - /** - * @return 获取广告id - */ - fun getGAID(): String { - Logger.info( - TAG, - "getGAID from cache, GAID=$GAID" - ) - return GAID - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt index ecfa4a8a6..0b5c814c7 100644 --- a/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt @@ -25,7 +25,6 @@ import com.opensource.svgaplayer.SVGADrawable import com.opensource.svgaplayer.SVGAImageView import com.opensource.svgaplayer.SVGAParser import com.opensource.svgaplayer.SVGAVideoEntity -import com.umeng.commonsdk.statistics.common.DeviceConfig import com.yizhuan.erban.R import com.yizhuan.erban.application.IReportConstants import com.yizhuan.erban.application.ReportManager @@ -50,6 +49,7 @@ import com.yizhuan.xchat_android_core.utils.toast import com.yizhuan.xchat_android_core.vip.VipAuthInfo import com.yizhuan.xchat_android_core.vip.VipInfo import com.yizhuan.xchat_android_core.vip.VipOpenEvent +import com.yizhuan.xchat_android_library.common.util.DeviceUtil import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil import com.yizhuan.xchat_android_library.utils.SingleToastUtil import org.greenrobot.eventbus.EventBus @@ -243,7 +243,7 @@ class VipMainActivity : BaseViewBindingActivity(), ReportManager.get().reportEvent(IReportConstants.PAY_CLICK, map) CommonWebViewActivity.start( context, - UriProvider.getOfficialPay(5, DeviceConfig.getDeviceId(context)) + UriProvider.getOfficialPay(5, DeviceUtil.getDeviceId(context)) ) } } diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java index 648144ea5..ad0400bdb 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java @@ -39,8 +39,6 @@ import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -210,11 +208,6 @@ public class WorldDynamicAdapter extends BaseQuickAdapter { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_COMMENT_MOMENTS, - ResUtil.getString(R.string.dynamic_adapter_worlddynamicadapter_02)); - //1.3.1新埋点 - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_COMMENT_MOMENTS_B, - ResUtil.getString(R.string.dynamic_adapter_worlddynamicadapter_03) + worldId); DynamicDetailActivity.start(context, item.getDynamicId(), worldId, helper.getAdapterPosition(), true, 1); } diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java index 454e6a0d2..6930d2e25 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java @@ -66,8 +66,6 @@ import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; import com.yizhuan.xchat_android_core.community.event.DynamicDetailFinishEvent; import com.yizhuan.xchat_android_core.community.event.DynamicRefreshEvent; import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_core.utils.net.BeanObserver; @@ -182,8 +180,6 @@ public class DynamicDetailActivity extends BaseViewBindingActivity { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_COPY_COMMENT, ResUtil.getString(R.string.dynamic_view_dynamicdetailactivity_013)); ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); cm.setText(params.getCopyContent()); toast(R.string.copy_success); @@ -599,7 +594,6 @@ public class DynamicDetailActivity extends BaseViewBindingActivity { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_DELETE_COMMENT, ResUtil.getString(R.string.dynamic_view_dynamicdetailactivity_014)); popupWindow.dismiss(); DynamicDetailModel.get().deleteComment(params.getDeteleId()) .compose(bindUntilEvent(ActivityEvent.DESTROY)) @@ -618,7 +612,6 @@ public class DynamicDetailActivity extends BaseViewBindingActivity { popupWindow.dismiss(); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_REPORT_COMMENT, ResUtil.getString(R.string.dynamic_view_dynamicdetailactivity_015)); UIHelper.showReportPage(context, params.getCommentOwnerUid(), XChatConstants.REPORT_TYPE_DYNAMICCOMMENT); }); @@ -720,8 +713,6 @@ public class DynamicDetailActivity extends BaseViewBindingActivity { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_VIEW_WORLD_PAGE, - ResUtil.getString(R.string.dynamic_view_dynamicdetailactivity_016)); TopicMainActivity.start(context, String.valueOf(bean.getWorldId())); }); @@ -737,8 +728,6 @@ public class DynamicDetailActivity extends BaseViewBindingActivity { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_SHARE_MOMENTS, - ResUtil.getString(R.string.dynamic_view_dynamicdetailactivity_017)); new ShareDynamicHelper(DynamicDetailActivity.this) .share(bean, worldId); }); @@ -778,8 +767,6 @@ public class DynamicDetailActivity extends BaseViewBindingActivity { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_REPORT_MOMENTS, - ResUtil.getString(R.string.dynamic_view_dynamicdetailactivity_019)); UIHelper.showReportPage(context, bean.getUid(), XChatConstants.REPORT_TYPE_WORLDDYNAMIC); }); @@ -825,8 +812,6 @@ public class DynamicDetailActivity extends BaseViewBindingActivity() { diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java index 84dd37132..74c71f989 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java @@ -28,8 +28,6 @@ import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; import com.yizhuan.xchat_android_core.community.event.DynamicDetailFinishEvent; import com.yizhuan.xchat_android_core.community.event.DynamicPublishEvent; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; @@ -74,11 +72,11 @@ public class WorldDynamicFragment extends BaseMvpFragment list = new ArrayList<>(); if (!UserModel.get().isMyseft(bean.getUid())) { ButtonItem item = new ButtonItem(ResUtil.getString(R.string.dynamic_view_worlddynamicfragment_01), () -> { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_REPORT_MOMENTS, - ResUtil.getString(R.string.dynamic_view_worlddynamicfragment_02)); UIHelper.showReportPage(WorldDynamicFragment.this.getActivity(), bean.getUid(), XChatConstants.REPORT_TYPE_WORLDDYNAMIC); }); @@ -168,8 +164,6 @@ public class WorldDynamicFragment extends BaseMvpFragment() { @Override @@ -251,7 +245,7 @@ public class WorldDynamicFragment extends BaseMvpFragment() { @@ -299,8 +293,6 @@ public class WorldDynamicFragment extends BaseMvpFragment { return miniWorldChooseInfo != null && miniWorldChooseInfo.isInWorld(); } - public void statistics() { - if (miniWorldChooseInfo != null && miniWorldChooseInfo.getWorldId() > 0) { - long worldId = miniWorldChooseInfo.getWorldId(); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_PUBLISH_SUCCEED, - ResUtil.getString(R.string.publish_presenter_publishpresenter_06) + worldId); - } else { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_PUBLISH_SUCCEED, - ResUtil.getString(R.string.publish_presenter_publishpresenter_07)); - } - - } } diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java index 0de57e8dc..4d6c300bc 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java @@ -46,8 +46,6 @@ import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; import com.yizhuan.xchat_android_core.community.bean.PublishItem; import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; @@ -412,8 +410,6 @@ public class PublishActivity extends BaseMvpActivity { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_COMMENT_MOMENTS, - ResUtil.getString(R.string.square_adapter_squaredynamicadapter_02)); - //1.3.1新埋点 - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_COMMENT_MOMENTS_B, - ResUtil.getString(R.string.square_adapter_squaredynamicadapter_03) + item.getWorldId()); DynamicDetailActivity.start(context, item.getDynamicId(), item.getWorldId(), helper.getAdapterPosition(), true, 6); } @@ -220,8 +213,6 @@ public class SquareDynamicAdapter extends BaseQuickAdapter 0); helper.setText(R.id.tv_mini_world_name, item.getWorldName()); helper.getView(R.id.tv_mini_world_name).setOnClickListener(v -> { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_VIEW_WORLD_PAGE, - mContext.getString(R.string.topic_page_is_displayed)); TopicMainActivity.start(context, String.valueOf(item.getWorldId())); }); } diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java index 4267fc8b9..79ad16b8e 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java @@ -20,8 +20,6 @@ import com.yizhuan.xchat_android_constants.XChatConstants; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.community.bean.UserDynamicItem; import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -93,16 +91,12 @@ public class UserDynamicFrg extends BaseMvpFragment { @SuppressLint("CheckResult") public void deleteDynamic(long worldId, long dynamicId) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_DELETE_MOMENTS, - ResUtil.getString(R.string.community_user_dynamic_userdynamicpresenter_03)); DynamicModel.get().delete(worldId, dynamicId) .compose(bindToLifecycle()) .subscribe(new BiConsumer() { diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java b/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java index 7c866afdc..cf928e418 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java @@ -44,8 +44,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.utils.ResUtil; import lombok.Setter; @@ -183,8 +181,6 @@ public class ExpandableTextView extends LinearLayout implements View.OnClickList } else if (eventType == 4) { label = ResUtil.getString(R.string.community_widget_expandabletextview_04); } - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_MOMENTS_MORE, - ResUtil.getString(R.string.community_widget_expandabletextview_05) + label); int height = getHeight(); int tvHeight = mTv.getHeight(); diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java index c7d13249e..d6056008a 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java @@ -26,12 +26,9 @@ import com.yizhuan.erban.module_hall.income.view.IIncomeStatisticsView; import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.CommonUtils; import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import java.util.ArrayList; import java.util.List; @@ -78,10 +75,6 @@ public class IncomeStatisticsActivity extends BaseMvpActivity { if (isWorldOriginatorOrMember(infoVM.getUserType())) {// 点击成员数量 - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MINI_WORLD_PAGE_VIEW_MEMBERS_LIST, ResUtil.getString(R.string.miniworld_activity_miniworldguestpageactivity_019)); MiniWorldMemberListActivity.start(context, worldId, getMvpPresenter().getOwnerUid() == AuthModel.get().getCurrentUid(), MiniWorldMemberListActivity.TYPE_WORLD_MEMBER); @@ -650,20 +634,18 @@ public class MiniWorldGuestPageActivity extends BaseMvpActivity { getDialogManager().dismissDialog(); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MINI_WORLD_PAGE_INVITE_FRIENDS, ResUtil.getString(R.string.miniworld_activity_miniworldguestpageactivity_024)); shareMiniWorld();// 点击群聊-世界人数不足时弹窗去邀请好友-邀请好友 }); TextView tvLater = window.findViewById(R.id.tv_world_dialog_later); tvLater.setOnClickListener(view1 -> { getDialogManager().dismissDialog(); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MINI_WORLD_PAGE_TALK_ABOUT_NEXT_TIME, ResUtil.getString(R.string.miniworld_activity_miniworldguestpageactivity_025)); }); } @Override public void showJoinTeamDialog(String title) { showConfirmDialog(title, - ResUtil.getString(R.string.miniworld_activity_miniworldguestpageactivity_026), + ResUtil.getString(R.string.miniworld_activity_miniworldguestpageactivity_026), ResUtil.getString(R.string.miniworld_activity_miniworldguestpageactivity_027), ResUtil.getString(R.string.miniworld_activity_miniworldguestpageactivity_028), new View.OnClickListener() { @Override @@ -678,7 +660,7 @@ public class MiniWorldGuestPageActivity extends BaseMvpActivity() { @@ -790,10 +784,6 @@ public class MiniWorldTeamMessageActivity extends BaseMessageActivity implements @Override public void groupChatGetSuccess(MWChatInfo mwChatInfo) { mMwChatInfo = mwChatInfo; - if (isInTeam) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_PAGE_ENTER_GROUP_CHAT_B, - ResUtil.getString(R.string.miniworld_activity_miniworldteammessageactivity_024) + mMwChatInfo.getWorldId()); - } tvTheme.setText("" + mMwChatInfo.getTopic()); mCount = mMwChatInfo.getCount(); rlTipsParty.setVisibility(mCount > 0 ? View.VISIBLE : View.GONE); diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java index 8f4126bc2..bee90e87c 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java @@ -55,8 +55,6 @@ import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldTeamExitEvent; import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; import com.yizhuan.xchat_android_core.share.ShareModel; import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; @@ -107,7 +105,6 @@ public class TopicMainActivity extends BaseMvpActivity { getDialogManager().dismissDialog(); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MINI_WORLD_PAGE_INVITE_FRIENDS, ResUtil.getString(R.string.miniworld_activity_topicmainactivity_012)); shareMiniWorld();// 点击群聊-世界人数不足时弹窗去邀请好友-邀请好友 }); TextView tvLater = window.findViewById(R.id.tv_world_dialog_later); tvLater.setOnClickListener(view1 -> { getDialogManager().dismissDialog(); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MINI_WORLD_PAGE_TALK_ABOUT_NEXT_TIME, ResUtil.getString(R.string.miniworld_activity_topicmainactivity_013)); }); } @@ -408,7 +398,6 @@ public class TopicMainActivity extends BaseMvpActivity { diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/fragment/LocalMusicListFragment.java b/app/src/module_music/java/com/yizhuan/tutu/music/fragment/LocalMusicListFragment.java index e2a864264..7c3aac753 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/fragment/LocalMusicListFragment.java +++ b/app/src/module_music/java/com/yizhuan/tutu/music/fragment/LocalMusicListFragment.java @@ -32,8 +32,6 @@ import com.yizhuan.xchat_android_core.music.event.MusicStopEvent; import com.yizhuan.xchat_android_core.music.model.IPlayerModel; import com.yizhuan.xchat_android_core.music.model.PlayerModel; import com.yizhuan.xchat_android_core.music.view.ILocalMusicListView; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -321,7 +319,6 @@ public class LocalMusicListFragment extends BaseMvpFragment { if (callback != null) { callback.onFail(); @@ -337,8 +322,7 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr } }); GiftDialog.GIFT_DIALOG_FROM = ResUtil.getString(R.string.public_chat_hall_fragment_publicchathallmessagefragment_05); - UserInfoDialog.showNewUserInfoDialog(event.getContext(), Long.valueOf(event.getMessage().getFromAccount())); - StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_homepage_click,ResUtil.getString(R.string.public_chat_hall_fragment_publicchathallmessagefragment_06)); + UserInfoDialog.showNewUserInfoDialog(event.getContext(), Long.valueOf(event.getMessage().getFromAccount())); }); } @@ -436,8 +420,6 @@ public class PublicChatHallMessageFragment extends TFragment implements ModulePr } - - @Subscribe(threadMode = ThreadMode.MAIN) public void onIncomingMsg(PublicChatHallMsgIncomingEvent event) { List messages = new ArrayList<>(); diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java index abe22aab5..3390231a0 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomInviteFansActivity.java @@ -12,8 +12,6 @@ import com.yizhuan.tutu.room_chat.event.ClickRootViewEvent; import com.yizhuan.tutu.room_chat.utils.InViteFansTimer; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.room.model.RoomInviteFansModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; @@ -70,7 +68,6 @@ public class RoomInviteFansActivity extends BaseViewBindingActivity { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_INVITEFANS_CLICK, ResUtil.getString(R.string.room_chat_activity_roominvitefansactivity_08)); onRoomInviteFansClick(); }); } diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java index 710539256..cf4c334c1 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java @@ -27,8 +27,6 @@ import com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity; import com.yizhuan.xchat_android_core.auth.event.LoginEvent; import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; @@ -103,7 +101,6 @@ public class RoomMsgRecentListFragment extends BaseFragment { SharedPreferenceUtils.put(share_pref_is_newbie_clicked, true);// 是否第一次点击发现萌新 ivRedPoint.setVisibility(View.GONE); RoomNewbieActivity.start(getActivity(), true); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_MESSAGE_FINDNEW_CLICK, ResUtil.getString(R.string.room_chat_fragment_roommsgrecentlistfragment_01)); }); } diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java index 4461f7f11..86ce945da 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java @@ -19,9 +19,6 @@ import com.coorchice.library.utils.LogUtils; import com.yizhuan.erban.R; import com.yizhuan.erban.ui.webview.DialogWebViewActivity; import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.TimeUtils; @@ -61,16 +58,16 @@ public class ChooseTreasureBoxDialogFragment extends DialogFragment implements V mTvOpenHonour = view.findViewById(R.id.tv_open_honour); view.findViewById(R.id.iv_close).setOnClickListener(this); clBoxNormal.setOnClickListener(this); - tvOpenTime.setText(ResUtil.getString(R.string.treasure_box_fragment_choosetreasureboxdialogfragment_01)+ mOpenTime); + tvOpenTime.setText(ResUtil.getString(R.string.treasure_box_fragment_choosetreasureboxdialogfragment_01) + mOpenTime); // String mOpenTime = "11:10-02:00"; - int startTime = Integer.parseInt(mOpenTime.substring(0,mOpenTime.indexOf("-")).replace(":","")); - int endTime = Integer.parseInt(mOpenTime.substring(mOpenTime.indexOf("-") + 1).replace(":","")); - LogUtils.e("startTime"+startTime); - LogUtils.e("endTime"+endTime); - LogUtils.e(ResUtil.getString(R.string.treasure_box_fragment_choosetreasureboxdialogfragment_02)+TimeUtils.getTimeLimit(startTime,endTime)); + int startTime = Integer.parseInt(mOpenTime.substring(0, mOpenTime.indexOf("-")).replace(":", "")); + int endTime = Integer.parseInt(mOpenTime.substring(mOpenTime.indexOf("-") + 1).replace(":", "")); + LogUtils.e("startTime" + startTime); + LogUtils.e("endTime" + endTime); + LogUtils.e(ResUtil.getString(R.string.treasure_box_fragment_choosetreasureboxdialogfragment_02) + TimeUtils.getTimeLimit(startTime, endTime)); - mTvOpenHonour.setEnabled(TimeUtils.getTimeLimit(startTime,endTime)); - if (TimeUtils.getTimeLimit(startTime,endTime)){ + mTvOpenHonour.setEnabled(TimeUtils.getTimeLimit(startTime, endTime)); + if (TimeUtils.getTimeLimit(startTime, endTime)) { clBoxHonour.setOnClickListener(this); } view.findViewById(R.id.ll_get_key).setOnClickListener(v -> DialogWebViewActivity.start(getContext(), UriProvider.getBoxKey())); @@ -99,21 +96,11 @@ public class ChooseTreasureBoxDialogFragment extends DialogFragment implements V dismiss(); } else if (id == R.id.cl_box_normal) { if (onTreasureBoxChooseListener != null) { - if (AvRoomDataManager.get().isCpRoom()) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_CP_ROOM_SMASHEGG_CHOOSE, ResUtil.getString(R.string.treasure_box_fragment_choosetreasureboxdialogfragment_03)); - } else { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MP_ROOM_SMASHEGG_CHOOSE, ResUtil.getString(R.string.treasure_box_fragment_choosetreasureboxdialogfragment_04)); - } onTreasureBoxChooseListener.onBoxClick(0); } dismiss(); } else if (id == R.id.cl_box_honour) { if (onTreasureBoxChooseListener != null) { - if (AvRoomDataManager.get().isCpRoom()) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_CP_ROOM_SMASHEGG_CHOOSE, ResUtil.getString(R.string.treasure_box_fragment_choosetreasureboxdialogfragment_05)); - } else { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MP_ROOM_SMASHEGG_CHOOSE, ResUtil.getString(R.string.treasure_box_fragment_choosetreasureboxdialogfragment_06)); - } onTreasureBoxChooseListener.onBoxClick(1); } dismiss(); diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java index d13ca18fb..8445c9bab 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java @@ -5,7 +5,6 @@ import android.content.Context; import androidx.annotation.Nullable; import androidx.fragment.app.FragmentActivity; -import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.yizhuan.erban.R; import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity; import com.yizhuan.erban.treasure_box.activity.TreasureBoxHonourActivity; @@ -16,8 +15,6 @@ import com.yizhuan.xchat_android_core.initial.bean.InitInfo; import com.yizhuan.xchat_android_core.level.UserLevelVo; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; 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; @@ -65,10 +62,6 @@ public class GoldBoxHelper { } else if (type == 1) {// 梦幻许愿池 TreasureBoxHonourActivity.start(context); } - if (AvRoomDataManager.get().isCpRoom()) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_CP_ROOM_SMASH_EGG_CLICK, ResUtil.getString(R.string.treasure_box_widget_goldboxhelper_02)); - } else - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MP_ROOM_SMASH_EGG_CLICK, ResUtil.getString(R.string.treasure_box_widget_goldboxhelper_03)); }); chooseTreasureBoxDialogFragment.show(((FragmentActivity) context).getSupportFragmentManager(), "chooseTreasureBoxDialogFragment"); } else { diff --git a/core/build.gradle b/core/build.gradle index e45ac1e68..21256eee9 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -68,9 +68,6 @@ dependencies { api "com.orhanobut:logger:${loggerVersion}" - api 'com.umeng.umsdk:common:9.5.0'// 必选 - api 'com.umeng.umsdk:asms:1.4.1'// 必选 - compileOnly "org.projectlombok:lombok:${Lombok}" annotationProcessor "org.projectlombok:lombok:${Lombok}" diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java index e98bc9c47..cf0d5651b 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java @@ -87,11 +87,6 @@ public class XChatConstants { */ public static final String BAIDU_APP_KEY = "b8a4cb4bd1";//已更改 - /** - * 友盟統計 key - */ - public static final String UMENG_APP_KEY = "634d1fbf88ccdf4b7e4bcb0e";//已更改 - /** * linkedMe key */ diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java index 99106b1d4..d57c71f10 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java @@ -156,8 +156,6 @@ import com.yizhuan.xchat_android_core.share.bean.InAppSharingRoomInfo; import com.yizhuan.xchat_android_core.share.bean.InAppSharingTeamInfo; import com.yizhuan.xchat_android_core.share.bean.SessionType; import com.yizhuan.xchat_android_core.statistic.StatLogKey; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.super_admin.SuperAdminDataMrg; import com.yizhuan.xchat_android_core.super_admin.attachment.SuperAdminOpAttachment; import com.yizhuan.xchat_android_core.super_admin.bean.SaOpInfo; @@ -513,9 +511,6 @@ public final class IMNetEaseManager { RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo; if (roomInfo != null) parans.put("room_id", String.valueOf(roomInfo.getRoomId())); - - StatisticManager.Instance().onEvent(BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.EVENT_RECONNECTION_ROOM_CHAT, ResUtil.getString(R.string.xchat_android_core_manager_imneteasemanager_011), parans); } else if (chatRoomStatusChangeData.status.wontAutoLogin()) { MLog.info(TAG, ResUtil.getString(R.string.xchat_android_core_manager_imneteasemanager_012)); @@ -541,8 +536,6 @@ public final class IMNetEaseManager { } else { parans.put("is_on_mic", "0"); } - StatisticManager.Instance().onEvent(BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.EVENT_LOST_NETWORK, ResUtil.getString(R.string.xchat_android_core_manager_imneteasemanager_014), parans); } } @@ -1703,31 +1696,10 @@ public final class IMNetEaseManager { case POLL: downMicroQueue(key); - //埋點統計用戶上麥時長 - if (AvRoomDataManager.get().isOwnerOnMic()) { - Map attributes = new HashMap<>(2); - attributes.put("userUid", AuthModel.get().getCurrentUid() + ""); - attributes.put("roomUid", AvRoomDataManager.get().mCurrentRoomInfo.getUid() + ""); - StatisticManager.Instance().onEventEnd( - BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.EVENT_USER_ON_MIC, - "用戶在麥上", - attributes); - } - break; case OFFER: Map senderExtension = msg.getChatRoomMessageExtension().getSenderExtension(); upMicroQueue(content, key, senderExtension); - - //埋點統計用戶上麥時長 - if (!AvRoomDataManager.get().isOwnerOnMic()) { - StatisticManager.Instance().onEventStart( - BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.EVENT_USER_ON_MIC, - "用戶在麥上"); - } - break; case PARTCLEAR: break; @@ -1785,29 +1757,6 @@ public final class IMNetEaseManager { } ); } - long uid = AuthModel.get().getCurrentUid(); - if (curRoomInfo.getUid() == uid) { - StatisticManager.Instance().onEventStart(BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.EVENT_OPENROOM, "開房"); - } - - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_LIST_LABEL, - "區分房間標簽:" + curRoomInfo.getRoomTag()); - - //進入房間時長 - StatisticManager.Instance().onEventStart(BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.EVENT_ROOM_LENGTH_OF_STAY_TIME, "在房間內停留時長"); - - //進入房間次數 - Map attributes = new HashMap<>(2); - attributes.put("userUid", AuthModel.get().getCurrentUid() + ""); - attributes.put("roomUid", curRoomInfo.getUid() + ""); - StatisticManager.Instance().onEvent( - BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.EVENT_ENTER_ROOM_COUNT, - "進入房間", - attributes); - } diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ImRetryManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ImRetryManager.java index c8b25844a..af1dccdaf 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ImRetryManager.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ImRetryManager.java @@ -6,8 +6,6 @@ import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.yizhuan.xchat_android_core.R; import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_library.utils.ResUtil; import io.reactivex.Single; @@ -43,13 +41,9 @@ public class ImRetryManager { //首次失败，加埋点 String log = ResUtil.getString(R.string.xchat_android_core_retry_imretrymanager_01) + error; ImRetryManager.log(log); - StatisticManager.Instance().onEvent( - StatisticsProtocol.EVENT_ROOM_GIFT_FAILED, log); } else if (failedCount == MAX_RETRY_COUNT + 1) { String log = ResUtil.getString(R.string.xchat_android_core_retry_imretrymanager_02) + error; ImRetryManager.log(log); - StatisticManager.Instance().onEvent( - StatisticsProtocol.EVENT_ROOM_GIFT_RETRY_FAILED, log); } } }) @@ -58,8 +52,6 @@ public class ImRetryManager { if (param.getRetryCount() > 1) { String log = ResUtil.getString(R.string.xchat_android_core_retry_imretrymanager_03) + (param.getRetryCount() - 1); ImRetryManager.log(log); - StatisticManager.Instance().onEvent( - StatisticsProtocol.EVENT_ROOM_GIFT_RETRY_SUCCEED, log); } }) .doOnError(throwable -> { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java b/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java index bab8d343c..ff6abeb6a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java @@ -28,7 +28,6 @@ import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.CustomNotification; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.xchat_android_core.R; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.community.attachment.UnReadCountAttachment; import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent; @@ -56,13 +55,10 @@ import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent; import com.yizhuan.xchat_android_core.pay.event.FirstRechargeEvent; import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent; import com.yizhuan.xchat_android_core.room.event.RoomTaskTipsEvent; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.vip.VipInfo; import com.yizhuan.xchat_android_core.vip.VipOpenEvent; import com.yizhuan.xchat_android_core.vip.VipUpgradeEvent; -import com.yizhuan.xchat_android_library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; @@ -158,8 +154,6 @@ public class IMSystemMsgManager { masterMissionOneAttachment.fromJson(data); mentoringRelationshipMissionEvent.setCustomAttachment(masterMissionOneAttachment); // 师父任务一开始，打点 - StatisticManager.Instance().onEvent(StatisticsProtocol.NEWS_TASK_ONE_START, - ResUtil.getString(R.string.xchat_android_core_manager_imsystemmsgmanager_01)); break; case CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_ONE_APPRENTICE: @@ -176,12 +170,6 @@ public class IMSystemMsgManager { masterMissionTwoAttachment.setData(data); masterMissionTwoAttachment.fromJson(data); mentoringRelationshipMissionEvent.setCustomAttachment(masterMissionTwoAttachment); - // 任务一完成，打点 - StatisticManager.Instance().onEvent(StatisticsProtocol.NEWS_TASK_ONE_COMPLETE, - ResUtil.getString(R.string.xchat_android_core_manager_imsystemmsgmanager_02)); - // 任务二开始，打点 - StatisticManager.Instance().onEvent(StatisticsProtocol.NEWS_TASK_TWO_START, - ResUtil.getString(R.string.xchat_android_core_manager_imsystemmsgmanager_03)); break; case CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_TWO_APPRENTICE: @@ -198,9 +186,6 @@ public class IMSystemMsgManager { masterMissionThreeAttachment.setData(data); masterMissionThreeAttachment.fromJson(data); mentoringRelationshipMissionEvent.setCustomAttachment(masterMissionThreeAttachment); - // 任务三开始，打点 - StatisticManager.Instance().onEvent(StatisticsProtocol.NEWS_TASK_THREE_START, - ResUtil.getString(R.string.xchat_android_core_manager_imsystemmsgmanager_04)); break; case CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_THREE_APPRENTICE: @@ -217,9 +202,6 @@ public class IMSystemMsgManager { masterMissionFourAttachment.setData(data); masterMissionFourAttachment.fromJson(data); mentoringRelationshipMissionEvent.setCustomAttachment(masterMissionFourAttachment); - // 任务四开始，打点 - StatisticManager.Instance().onEvent(StatisticsProtocol.NEWS_TASK_FOUR_COMPLETE, - ResUtil.getString(R.string.xchat_android_core_manager_imsystemmsgmanager_05)); break; case CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_FOUR_APPRENTICE: @@ -235,9 +217,6 @@ public class IMSystemMsgManager { resultAttachment.setData(data); resultAttachment.fromJson(data); mentoringRelationshipMissionEvent.setCustomAttachment(resultAttachment); - // 收徒成功，打点 - StatisticManager.Instance().onEvent(StatisticsProtocol.NEWS_SUCCESSFUL_APPRENTICE, - ResUtil.getString(R.string.xchat_android_core_manager_imsystemmsgmanager_06)); break; case CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_ONE_TIPS: @@ -247,9 +226,6 @@ public class IMSystemMsgManager { tipsAttachment.setData(data); tipsAttachment.fromJson(data); mentoringRelationshipMissionEvent.setCustomAttachment(tipsAttachment); - // 收徒失败，打点 - StatisticManager.Instance().onEvent(StatisticsProtocol.NEWS_FAILURE_TO_RECEIVE_APPRENTICE, - ResUtil.getString(R.string.xchat_android_core_manager_imsystemmsgmanager_07)); break; case CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_GRAB_APPRENTICES: @@ -258,9 +234,6 @@ public class IMSystemMsgManager { grabApprenticesAttachment.setData(data); grabApprenticesAttachment.fromJson(data); mentoringRelationshipMissionEvent.setCustomAttachment(grabApprenticesAttachment); - // 收到抢徒弟消息，打点 - StatisticManager.Instance().onEvent(StatisticsProtocol.MENTOR_PUSH, - ResUtil.getString(R.string.xchat_android_core_manager_imsystemmsgmanager_08)); break; } EventBus.getDefault().post(mentoringRelationshipMissionEvent); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java index 8da4b3af2..dd0af2b05 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java @@ -2,8 +2,8 @@ package com.yizhuan.xchat_android_core.radish.signin; import android.util.Log; -import com.yizhuan.xchat_android_core.R; import com.yizhuan.xchat_android_core.BuildConfig; +import com.yizhuan.xchat_android_core.R; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.base.BaseModel; import com.yizhuan.xchat_android_core.bean.response.ServiceResult; @@ -15,8 +15,6 @@ import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; import com.yizhuan.xchat_android_core.radish.signin.bean.SignInfo; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.net.rxnet.RxNet; import com.yizhuan.xchat_android_library.utils.ResUtil; @@ -108,8 +106,8 @@ public class SignInModel extends BaseModel implements ISignInModel { /** * 获取签到分享图片 - * @param shareType - * 1普通，2领取礼物，3瓜分钻石 + * + * @param shareType 1普通，2领取礼物，3瓜分钻石 */ @Override public Single getShareImage(int shareType, @Nullable String day, @Nullable String reward) { @@ -168,9 +166,10 @@ public class SignInModel extends BaseModel implements ISignInModel { return api.replenishSign(AuthModel.get().getCurrentUid(), signDay) .compose(RxHelper.handleGoods()) .compose(RxHelper.handleCommon()) - .doOnSuccess(signInfo -> - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_RE_SIGN_SUCCESS, - ResUtil.getString(R.string.radish_signin_signinmodel_04) + signInfo.getReplenishSignNum())); + .doOnSuccess(signInfo -> { + + } + ); } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java index 64f6259f9..94ba017a1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java @@ -48,8 +48,6 @@ import com.yizhuan.xchat_android_core.room.event.RoomInfoEvent; import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; import com.yizhuan.xchat_android_core.room.model.inteface.IAvRoomModel; import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.super_admin.bean.KickOutExtBean; import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; import com.yizhuan.xchat_android_core.user.UserModel; @@ -60,7 +58,6 @@ import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack; import com.yizhuan.xchat_android_library.utils.JavaUtil; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; import org.greenrobot.eventbus.EventBus; @@ -238,27 +235,19 @@ public class AvRoomModel extends RoomBaseModel implements IAvRoomModel { Map attributes = new HashMap<>(2); attributes.put("roomType", currentRoom.getType() + ""); attributes.put("roomUid", currentRoom.getUid() + ""); - StatisticManager.Instance().onEventEnd(BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.EVENT_OPENROOM, ResUtil.getString(R.string.room_model_avroommodel_02), attributes); //埋点统计用户上麦时长 if (AvRoomDataManager.get().isOwnerOnMic()) { Map attr = new HashMap<>(2); attr.put("userUid", AuthModel.get().getCurrentUid() + ""); attr.put("roomUid", currentRoom.getUid() + ""); - StatisticManager.Instance().onEventEnd( - BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.EVENT_USER_ON_MIC, - ResUtil.getString(R.string.room_model_avroommodel_03), - attributes); } } //进入房间统计事件结束 Map attributes = new HashMap<>(1); attributes.put("roomUid", currentRoom.getUid() + ""); - StatisticManager.Instance().onEventEnd(BasicConfig.INSTANCE.getAppContext(), - StatisticsProtocol.EVENT_ROOM_LENGTH_OF_STAY_TIME, ResUtil.getString(R.string.room_model_avroommodel_04), attributes); + //发送退出房间事件 IMNetEaseManager.get().getChatRoomEventObservable() .onNext(new RoomEvent().setEvent(RoomEvent.ROOM_EXIT) diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java deleted file mode 100644 index 885a0e38b..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.yizhuan.xchat_android_core.statistic; - -import android.content.Context; - -import androidx.annotation.Keep; - -import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_library.utils.config.BasicConfig; - -import java.util.Map; - -/** - *

统计接口管理

- * - * @author jiahui - * @date 2018/1/4 - */ -@Keep -public class StatisticManager { - private static final String TAG = "erban_log"; - - private volatile static StatisticManager mInstance; - - private final StatisticModel mStatisticModel; - - - private StatisticManager() { - mStatisticModel = new StatisticModel(); - } - - public static StatisticManager Instance() { - if (mInstance == null) { - synchronized (StatisticManager.class) { - if (mInstance == null) { - mInstance = new StatisticManager(); - } - } - } - return mInstance; - } - - /*********************************************统计方法 begin *********************************************/ - public void onPause(Context context) { - mStatisticModel.onPause(context); - } - - public void onResume(Context context) { - mStatisticModel.onResume(context); - } - - /** - * 在`自定义页面`的页面开始函数中调用 - * - * @param context - * @param pageName 页面名称 - */ - public void onPageStart(Context context, String pageName) { - mStatisticModel.onPageStart(context, pageName); - } - - /** - * 在`自定义页面`的页面结束函数中调用 - * - * @param context - * @param pageName 页面名称 - */ - public void onPageEnd(Context context, String pageName) { - mStatisticModel.onPageEnd(context, pageName); - } - - public void onEvent(String eventId, String eventLabel) { - LogUtil.e(eventId); - mStatisticModel.onEvent(BasicConfig.INSTANCE.getAppContext(), eventId, eventLabel, null); - } - - public void onEvent(String eventId, String eventLabel, Map arguments) { - LogUtil.e(eventId); - mStatisticModel.onEvent(BasicConfig.INSTANCE.getAppContext(), eventId, eventLabel, arguments); - } - - public void onEvent(Context context, String eventId, String eventLabel, Map arguments) { - mStatisticModel.onEvent(context, eventId, eventLabel, arguments); - } - - public void onEventStart(Context context, String eventId, String eventLabel) { - mStatisticModel.onEventStart(context, eventId, eventLabel); - } - - public void onEventEnd(Context context, String eventId, String eventLabel, Map arguments) { - mStatisticModel.onEventEnd(context, eventId, eventLabel, arguments); - } - - /*********************************************统计方法 end *********************************************/ - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java deleted file mode 100644 index 8baca3f8c..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.yizhuan.xchat_android_core.statistic; - -import android.content.Context; - -import androidx.annotation.Keep; - -import com.umeng.analytics.MobclickAgent; - -import java.util.Map; - -/** - *

- * - * @author jiahui - * @date 2018/1/4 - */ -@Keep -public class StatisticModel { - - void onEventEnd(Context context, String eventId, String eventLabel, Map arguments) { - MobclickAgent.onPageEnd(eventId); - } - - void onEventStart(Context context, String eventId, String eventLabel) { - MobclickAgent.onPageStart(eventId); - } - - void onEvent(Context context, String eventId, String eventLabel, Map arguments) { - if (arguments != null) { - MobclickAgent.onEvent(context, eventId, arguments); - } else { - MobclickAgent.onEvent(context, eventId, eventLabel); - } - } - - void onResume(Context context) { - MobclickAgent.onResume(context); - } - - void onPause(Context context) { - MobclickAgent.onPause(context); - } - - /** - * 自定义页面api - * - * @param context - * @param pageName 页面名称 - */ - void onPageStart(Context context, String pageName) { - } - - /** - * 自定义页面api - * - * @param context - * @param pageName 页面名称 - */ - void onPageEnd(Context context, String pageName) { - } - - -} diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicDetailModel.java b/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicDetailModel.java index e4f93806b..d76049272 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicDetailModel.java +++ b/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicDetailModel.java @@ -1,7 +1,6 @@ package com.yizhuan.xchat_android_core.community.dynamic; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.R; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.base.BaseModel; import com.yizhuan.xchat_android_core.bean.response.ServiceResult; @@ -9,11 +8,8 @@ import com.yizhuan.xchat_android_core.community.bean.CommentResult; import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; import com.yizhuan.xchat_android_core.community.bean.comment.Reply; import com.yizhuan.xchat_android_core.community.bean.comment.ReplyResult; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.utils.ResUtil; import io.reactivex.Single; import retrofit2.http.GET; @@ -54,8 +50,6 @@ public class DynamicDetailModel extends BaseModel implements IDynamicDetailModel @Override public Single reply(long dynamicId, long commentId, String content) { - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_REPLY_COMMENT, - ResUtil.getString(R.string.community_dynamic_dynamicdetailmodel_01)); return api.apiCommentReply(AuthModel.get().getCurrentUid(), dynamicId, commentId, content) .compose(RxHelper.handleCommon()); } @@ -81,7 +75,6 @@ public class DynamicDetailModel extends BaseModel implements IDynamicDetailModel @Query("worldId") long worldId); /** - * * @param timestamp 查询记录的时间戳 */ @GET("/dynamic/comment/list") @@ -103,21 +96,19 @@ public class DynamicDetailModel extends BaseModel implements IDynamicDetailModel @GET("/dynamic/comment/reply/list") Single> apiGetReplyList(@Query("uid") long uid, - @Query("dynamicId") long dynamicId, - @Query("pageSize") int pageSize, - @Query("commentId") long commentId, - @Query("timestamp") String timestamp); + @Query("dynamicId") long dynamicId, + @Query("pageSize") int pageSize, + @Query("commentId") long commentId, + @Query("timestamp") String timestamp); /** - * - * @param uid - + * @param uid - * @param commentId 评论/回复id (commentId或replyId) * @return - */ @POST("/dynamic/comment/delete") Single> apiDeleteComment(@Query("uid") long uid, - @Query("commentId") long commentId); - + @Query("commentId") long commentId); } diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java b/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java index b62b55cc6..52324cc39 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java +++ b/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java @@ -1,17 +1,13 @@ package com.yizhuan.xchat_android_core.community.dynamic; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.R; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.base.BaseModel; import com.yizhuan.xchat_android_core.bean.response.ServiceResult; import com.yizhuan.xchat_android_core.community.CommunityConstant; import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.net.rxnet.RxNet; -import com.yizhuan.xchat_android_library.utils.ResUtil; import io.reactivex.Single; import retrofit2.http.POST; @@ -54,22 +50,6 @@ public class DynamicModel extends BaseModel implements IDynamicModel { */ @Override public Single like(long worldId, long dynamicId, long likedUid, int status, int event) { - String label = ResUtil.getString(R.string.community_dynamic_dynamicmodel_01); - if (event == 2) { - label = ResUtil.getString(R.string.community_dynamic_dynamicmodel_02); - } else if (event == 3) { - label = ResUtil.getString(R.string.community_dynamic_dynamicmodel_03); - } else if (event == 4) { - label = ResUtil.getString(R.string.community_dynamic_dynamicmodel_04); - } - StatisticManager.Instance().onEvent(StatisticsProtocol.EVEMT_WORLD_LIKE_MOMENTS, - ResUtil.getString(R.string.community_dynamic_dynamicmodel_05) + label); - //1.3.1新埋点 - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_LIKE_MOMENTS_B, - ResUtil.getString(R.string.community_dynamic_dynamicmodel_06) + worldId); - StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_LIKE_MOMENTS_C, - ResUtil.getString(R.string.community_dynamic_dynamicmodel_07) + (status == 1 ? ResUtil.getString(R.string.community_dynamic_dynamicmodel_08) : ResUtil.getString(R.string.community_dynamic_dynamicmodel_09))); - return api.apiLike(AuthModel.get().getCurrentUid(), worldId, dynamicId, likedUid, status) .compose(RxHelper.handleIgnoreData()); } diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java index 14336a76b..ef7022774 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java +++ b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java @@ -19,8 +19,6 @@ import com.yizhuan.xchat_android_core.module_hall.hall.bean.OwnerHallInfo; import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall; import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo; import com.yizhuan.xchat_android_core.module_hall.hall.event.UserHallUpdateEvent; -import com.yizhuan.xchat_android_core.statistic.StatisticManager; -import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; 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.LoginUserInfoUpdateEvent; @@ -84,9 +82,6 @@ public class HallModel extends BaseModel implements IHallModel { if (userInfo != null) { hallId = userInfo.getHallId(); EventBus.getDefault().post(new UserHallUpdateEvent()); - if (hallId != 0) { - StatisticManager.Instance().onEvent(StatisticsProtocol.APP_LAUNCH_GH, ResUtil.getString(R.string.module_hall_hall_hallmodel_01)); - } } } diff --git a/library/build.gradle b/library/build.gradle index eb8cf599a..77536e5cc 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -139,6 +139,8 @@ dependencies { api 'io.github.razerdp:BasePopup:3.2.1' + api 'com.umeng.sdk:utdid:1.1.5.3' + } repositories { mavenCentral() diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java b/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java index 7b059848c..0e3ec48b6 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java @@ -23,11 +23,6 @@ public class ErBanService extends JobService { public boolean onStartJob(JobParameters params) { int jobId = params.getJobId(); Logger.d(ResUtil.getString(R.string.xchat_android_library_service_erbanservice_01), jobId); - -// StatisticManager.Instance().deleteLogFiles() -// .subscribe(aBoolean -> { -// Logger.i(ResUtil.getString(R.string.xchat_android_library_service_erbanservice_02) + (aBoolean ? ResUtil.getString(R.string.xchat_android_library_service_erbanservice_03) : ResUtil.getString(R.string.xchat_android_library_service_erbanservice_04))); -// }); return false; } diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/DeviceUtil.kt b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/DeviceUtil.kt new file mode 100644 index 000000000..41a4d9a59 --- /dev/null +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/DeviceUtil.kt @@ -0,0 +1,314 @@ +package com.yizhuan.xchat_android_library.common.util + +import android.annotation.SuppressLint +import android.app.ActivityManager +import android.content.Context +import android.os.Build +import android.os.Process +import android.provider.Settings +import android.telephony.TelephonyManager +import android.text.TextUtils +import com.ut.device.UTDevice +import com.yizhuan.xchat_android_library.common.application.BaseApp +import java.io.RandomAccessFile +import java.util.* + +/** + * create by wushaocheng 2023/2/15 + * 获取设备id + */ +object DeviceUtil { + private const val TAG = "DeviceUtils" + private const val ANDROID_ID_KEY = "android_id" + private const val cache_device_id = "cache_device_id" + private var deviceId = "" + private var mcc_mnc = "" + private var mcc = "" + private var mnc = "" + @Volatile + private var ANDROID_ID = "" + + /** + * 获取设备信息 + */ + var deviceDesc = "" + get() { + if (!TextUtils.isEmpty(field)) { + return field + } + field = + String.format("%s-%s-%s", Build.MANUFACTURER, Build.MODEL, Build.VERSION.RELEASE) + return field + } + private set + private const val MB = (1024 * 1024).toLong() + private var sLevelCache: LEVEL? = null + private var sTotalMemory: Long = 0 + + /** + * 获取设备等级，考虑到机身真实内存大小与参数规格里面的不太一致，排除系统可能占用的内存情况后，以下面方式来衡量： + * 1.内存小于等于4GB，定为中低端机 + * 2.内存大于4GB，定为高端机 + */ + fun getLevel(context: Context): LEVEL? { + if (null != sLevelCache) { + return sLevelCache + } + val totalMemory = getTotalMemory(context) + sLevelCache = if (totalMemory > 4 * 1024 * MB) { + //内存大于4GB，定为高端机 + LEVEL.HIGH + } else { + //内存小于等于4GB，定为中低端机 + LEVEL.LOW + } + return sLevelCache + } + + /** + * @return 当前进程id + */ + private val appId: Int + get() = Process.myPid() + + /** + * 获取设备内存总大小 + */ + private fun getTotalMemory(context: Context): Long { + if (0L != sTotalMemory) { + return sTotalMemory + } + val memInfo = ActivityManager.MemoryInfo() + val am = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager + am.getMemoryInfo(memInfo) + sTotalMemory = memInfo.totalMem + return sTotalMemory + } + + /** + * 当前设备是否处于低内存状态 + */ + fun isLowMemory(context: Context): Boolean { + val memInfo = ActivityManager.MemoryInfo() + val am = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager + am.getMemoryInfo(memInfo) + return memInfo.lowMemory + } + + /** + * 获取当前进程剩余内存大小 + */ + val appAvailableMemory: Long + get() { + val runtime = Runtime.getRuntime() + return runtime.totalMemory() - runtime.freeMemory() + } + + /** + * 获取当前设备CPU使用率 + */ + val appCpuRate: Double + get() { + var cpuTime = 0L + var appTime = 0L + var cpuRate = 0.0 + var procStatFile: RandomAccessFile? = null + var appStatFile: RandomAccessFile? = null + try { + procStatFile = RandomAccessFile("/proc/stat", "r") + val procStatString = procStatFile.readLine() + val procStats = procStatString.split(" ".toRegex()).dropLastWhile { it.isEmpty() } + .toTypedArray() + cpuTime = + procStats[2].toLong() + procStats[3].toLong() + procStats[4].toLong() + procStats[5].toLong() + procStats[6].toLong() + procStats[7].toLong() + procStats[8].toLong() + } catch (e: Exception) { + e.printStackTrace() + } finally { + try { + procStatFile?.close() + } catch (e: Exception) { + e.printStackTrace() + } + } + try { + appStatFile = RandomAccessFile("/proc/$appId/stat", "r") + val appStatString = appStatFile.readLine() + val appStats = + appStatString.split(" ".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray() + appTime = appStats[13].toLong() + appStats[14].toLong() + } catch (e: Exception) { + e.printStackTrace() + } finally { + try { + appStatFile?.close() + } catch (e: Exception) { + e.printStackTrace() + } + } + if (0L != cpuTime) { + cpuRate = appTime.toDouble() / cpuTime.toDouble() * 100.0 + } + return cpuRate + } + + /** + * 获取设备id + */ + @JvmStatic + fun getDeviceId(context: Context?): String { + if (!TextUtils.isEmpty(deviceId)) { + return deviceId + } + deviceId = Config.getInstance(context).getString(cache_device_id, "") + if (!TextUtils.isEmpty(deviceId)) { + return deviceId + } + deviceId = UTDevice.getUtdid(context) + if (TextUtils.isEmpty(deviceId)) { + deviceId = handyDevicesId + Logger.info(TAG, "use handy deviceId=$deviceId") + } else { + Logger.info(TAG, "use system deviceId=$deviceId") + } + //缓存上次取到的数据，避免有些机型每次打开APP都能拿到一个新的设备id + Config.getInstance(context).putString(cache_device_id, deviceId) + return deviceId + } + + /** + * @return 获取系统id + */ + @SuppressLint("HardwareIds") + @JvmStatic + fun getAndroidID(): String { + if (!TextUtils.isEmpty(ANDROID_ID)) { + Logger.info(TAG, "getAndroidID from cache, ANDROID_ID=$ANDROID_ID") + return ANDROID_ID + } + ANDROID_ID = SPUtils.getString(ANDROID_ID_KEY, "") + if (!TextUtils.isEmpty(ANDROID_ID)) { + Logger.info(TAG, "getAndroidID from SP, ANDROID_ID=$ANDROID_ID") + return ANDROID_ID + } + ANDROID_ID = Settings.Secure.getString( + BaseApp.getContext().contentResolver, + Settings.Secure.ANDROID_ID + ) + Logger.info(TAG, "getAndroidID from system, ANDROID_ID=$ANDROID_ID") + SPUtils.putString(ANDROID_ID_KEY, ANDROID_ID) + return ANDROID_ID + } + + /** + * @return 手动组装设备id + */ + private val handyDevicesId: String + get() { + val devIDShort = + "35" + Build.BOARD.length % 10 + Build.BRAND.length % 10 + Build.DEVICE.length % 10 + Build.MANUFACTURER.length % 10 + Build.MODEL.length % 10 + Build.PRODUCT.length % 10 + val serial = "serial" + return UUID(devIDShort.hashCode().toLong(), serial.hashCode().toLong()).toString() + } + + /** + * @return 移动设备国家代码（英语：Mobile Country Code，MCC）+移动设备网络代码（英语：Mobile Network Code，MNC） + */ + private fun getMCC_MNC(context: Context): String { + if (!TextUtils.isEmpty(mcc_mnc)) { + return mcc_mnc + } + try { + val telManager = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager + mcc_mnc = telManager.simOperator + if (!TextUtils.isEmpty(mcc_mnc)) { + //双卡双待手机会返回[46001,46002] or [,46007] or [46007,]这种格式， + //先取第一个，如果第一个为空且第二个不为空，则取第二个 + val s = mcc_mnc.split(",".toRegex()).dropLastWhile { it.isEmpty() } + .toTypedArray() + if (s.isNotEmpty() && !TextUtils.isEmpty(s[0])) { + mcc_mnc = s[0] + } else { + if (s.size == 2 && !TextUtils.isEmpty(s[1])) { + mcc_mnc = s[1] + } + } + } + return mcc_mnc + } catch (e: Exception) { + Logger.error(TAG, e.message) + } + return "" + } + + /** + * @return 移动设备国家代码（英语：Mobile Country Code，MCC），三位 + */ + fun getMCC(context: Context): String { + if (!TextUtils.isEmpty(mcc)) { + return mcc + } + try { + val mcc_mnc = getMCC_MNC(context) + if (mcc_mnc.length > 2) { + mcc = mcc_mnc.substring(0, 3) + return mcc + } + } catch (e: Exception) { + Logger.error(TAG, e.message) + } + return "" + } + + /** + * @return 移动设备网络代码（英语：Mobile Network Code，MNC），两位或三位 + */ + fun getMNC(context: Context): String { + if (!TextUtils.isEmpty(mnc)) { + return mnc + } + try { + val mcc_mnc = getMCC_MNC(context) + if (mcc_mnc.length > 3) { + mnc = mcc_mnc.substring(3) + return mnc + } + } catch (e: Exception) { + Logger.error(TAG, e.message) + } + return "" + } + + /** + * 检查指定包名的APP是否已安装了 + * + * @param context 上下文对象 + * @param packageName 包名 + * @return 是否有安装指定包名的APP，true代表已安装，false代表未安装 + */ + fun isAppInstalled(context: Context?, packageName: String): Boolean { + return if (context == null) { + false + } else { + var installed = false + try { + val pm = context.packageManager + val info = pm.getApplicationInfo(packageName, 0) + if (info != null) { + installed = true + } + } catch (e: Exception) { + Logger.error(TAG, "isAppInstalled packageName=$packageName", e) + } + installed + } + } + + /** + * 设备等级划分方案参考Matrix框架， + * 参考：[...](https://github.com/Tencent/matrix/blob/master/matrix/matrix-android/matrix-android-lib/src/main/java/com/tencent/matrix/util/DeviceUtil.java) + */ + enum class LEVEL(var value: Int) { + HIGH(2), LOW(1); + + } +} \ No newline at end of file