[Modify]修改google,facebook的登录配置

app/build.gradle

@@ -12,7 +12,7 @@ android {
     compileSdkVersion COMPILE_SDK_VERSION.toInteger()
 
     defaultConfig {
-        applicationId "com.vele.peko"
+        applicationId "com.vele.pekolive"
         minSdkVersion MIN_SDK_VERSION.toInteger()
         targetSdkVersion TARGET_SDK_VERSION.toInteger()
         versionCode Integer.valueOf(version_code)
@@ -73,19 +73,19 @@ android {
     signingConfigs {
 
         v2 {
-            storeFile file('../peko.jks')
-            storePassword "peko2022"
-            keyAlias "peko"
-            keyPassword "peko2022"
+            storeFile file('../pekolive.jks')
+            storePassword "peko2023"
+            keyAlias "pekolive"
+            keyPassword "peko2023"
             v2SigningEnabled true
             v1SigningEnabled true
         }
 
         v1 {
-            storeFile file('../peko.jks')
-            storePassword "peko2022"
-            keyAlias "peko"
-            keyPassword "peko2022"
+            storeFile file('../pekolive.jks')
+            storePassword "peko2023"
+            keyAlias "pekolive"
+            keyPassword "peko2023"
             v2SigningEnabled false
             v1SigningEnabled true
         }
@@ -265,7 +265,7 @@ dependencies {
 
     implementation 'com.github.mmin18:realtimeblurview:1.2.1'
 
-    implementation 'com.appsflyer:af-android-sdk:6.2.3'
+    implementation 'com.appsflyer:af-android-sdk:6.8.2'
 
     implementation 'com.github.zhpanvip:BannerViewPager:3.5.6'
 
@@ -277,9 +277,6 @@ dependencies {
     //Adjust接入
     implementation 'com.adjust.sdk:adjust-android:4.33.0'
     implementation 'com.android.installreferrer:installreferrer:2.2'
-    implementation 'com.adjust.sdk:adjust-android-samsung-referrer:4.33.0'
-    implementation 'com.adjust.sdk:adjust-android-xiaomi-referrer:4.33.0'
-    implementation 'com.miui.referrer:homereferrer:1.0.0.6'
     // Add the following if you are using the Adjust SDK inside web views on your app
     implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0'
 

app/google-services.json

@@ -1,41 +1,33 @@
 {
   "project_info": {
-    "project_number": "766987211654",
-    "project_id": "fluid-keyword-363108",
-    "storage_bucket": "fluid-keyword-363108.appspot.com"
+    "project_number": "656602722869",
+    "project_id": "pekolive-30f9e",
+    "storage_bucket": "pekolive-30f9e.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:766987211654:android:e22efc16d8ba608189d207",
+        "mobilesdk_app_id": "1:656602722869:android:dac206f8aae0ba9021f77c",
         "android_client_info": {
-          "package_name": "com.vele.peko"
+          "package_name": "com.vele.pekolive"
         }
       },
       "oauth_client": [
         {
-          "client_id": "766987211654-oe8kjt7rserq31d1rdulqj2aao5b96a7.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.vele.peko",
-            "certificate_hash": "a8ac3327a1144cf1b566ca7702338e471f143469"
-          }
-        },
-        {
-          "client_id": "766987211654-oe8kjt7rserq31d1rdulqj2aao5b96a7.apps.googleusercontent.com",
+          "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyBLTgRb9tTIGjUvIaGl0WoLJjVFSQlEEOA"
+          "current_key": "AIzaSyDDoTSpY3wxOefVDVKRmE9cDiT1iv8Ra-4"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": [
             {
-              "client_id": "766987211654-oe8kjt7rserq31d1rdulqj2aao5b96a7.apps.googleusercontent.com",
+              "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
               "client_type": 3
             }
           ]

app/proguard-rules.pro

@@ -435,25 +435,14 @@
 -dontwarn com.amap.**
 
 
--keep class com.zego.**{*;}
 -keep class com.mango.plugin.**{*;}
 
 -keep class android.support.v8.renderscript.** { *; }
 -keep class androidx.renderscript.** { *; }
 
--keep class com.google.android.gms.common.ConnectionResult {
-    int SUCCESS;
-}
--keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
-    com.google.android.gms.ads.identifier.AdvertisingIdClient$Info getAdvertisingIdInfo(android.content.Context);
-}
--keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info {
-    java.lang.String getId();
-    boolean isLimitAdTrackingEnabled();
-}
-
 ## Appsflyer
 -keep class com.appsflyer.** { *; }
+-dontwarn com.android.installreferrer
 
 ## easypermissions
 -keepclassmembers class * {
@@ -469,11 +458,21 @@
 -keep interface com.yalantis.ucrop.** { *; }
 
 ## BannerViewPage
--keep class androidx.recyclerview.widget.**{*;}
--keep class androidx.viewpager2.widget.**{*;}
+-keep class androidx.recyclerview.widget.** { *; }
+-keep class androidx.viewpager2.widget.** { *; }
 
-## Adust SDK
--keep public class com.adjust.sdk.**{ *; }
+## Adjust
+-keep class com.adjust.sdk.** { *; }
+-keep class com.google.android.gms.common.ConnectionResult {
+    int SUCCESS;
+}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
+    com.google.android.gms.ads.identifier.AdvertisingIdClient$Info getAdvertisingIdInfo(android.content.Context);
+}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info {
+    java.lang.String getId();
+    boolean isLimitAdTrackingEnabled();
+}
 -keep public class com.android.installreferrer.**{ *; }
--keep class com.sec.android.app.samsungapps.installreferrer.**{ *; }
--keep class com.miui.referrer.** {*;}
+
+-keep public class * extends java.lang.Exception

app/src/main/AndroidManifest.xml

@@ -70,6 +70,8 @@
     <uses-permission android:name="${applicationId}.push.permission.MESSAGE" />
     <uses-permission android:name="com.meizu.c2dm.permission.RECEIVE" />
     <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
+    <!-- AppsFlyer需要，参考：https://dev.appsflyer.com/hc/docs/install-android-sdk#setting-required-permissions -->
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
 
     <application
         android:name=".application.XChatApplication"
@@ -148,7 +150,7 @@
            如果 SDKOptions 中提供了，取 SDKOptions 中的值。
         -->
         <activity
-            android:name="com.vele.peko.lineapi.LineAuthenticationCallbackActivity"
+            android:name="com.vele.pekolive.lineapi.LineAuthenticationCallbackActivity"
             android:exported="true"
             android:launchMode="singleTask"
             android:noHistory="true">
@@ -895,9 +897,6 @@
         <activity
             android:name=".fansteam.FansTeamListActivity"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".avroom.newuserchargegift.NewUserChargeGiftDialog"
-            android:theme="@style/dialogactivity" />
         <activity
             android:name=".shipantics.PullRadishActivity"
             android:theme="@style/dialog_web_view_activity" />
@@ -1007,11 +1006,8 @@
         <receiver
             android:name="com.netease.nimlib.service.NimReceiver"
             android:exported="false"
-            android:process=":core">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter>
+            android:process=":core"
+            tools:node="remove">
         </receiver>
         <receiver android:name="com.netease.nimlib.service.ResponseReceiver" />
         <receiver
@@ -1022,15 +1018,6 @@
             </intent-filter>
         </receiver>
         <receiver android:name=".reciever.NotificationClickReceiver" />
-        <receiver
-            android:name="com.adjust.sdk.AdjustReferrerReceiver"
-            android:exported="true"
-            android:permission="android.permission.INSTALL_PACKAGES">
-            <intent-filter>
-                <action android:name="com.android.vending.INSTALL_REFERRER" />
-            </intent-filter>
-        </receiver>
-
         <service
             android:name="com.netease.nimlib.service.NimService"
             android:process=":core" />

app/src/main/java/com/vele/pekolive/lineapi/LineAuthenticationCallbackActivity.java

@@ -1,4 +1,4 @@
-package com.vele.peko.lineapi;
+package com.vele.pekolive.lineapi;
 
 import cn.sharesdk.line.LineHandlerActivity;
 

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<IMainView, MainPresenter>
             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<IMainView, MainPresenter>
         } 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<IMainView, MainPresenter>
     @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<IMainView, MainPresenter>
 
                 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;
         }

app/src/main/java/com/yizhuan/erban/UIHelper.java

@@ -1,11 +1,8 @@
 package com.yizhuan.erban;
 
 import android.app.Activity;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
-import android.provider.Settings;
 
 import com.yizhuan.erban.audio.MyVoiceActivity;
 import com.yizhuan.erban.audio.RecordingVoiceActivity;
@@ -19,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;
 
 
 /**
@@ -36,29 +30,6 @@ import com.yizhuan.xchat_android_library.utils.ResUtil;
  * **************************************************************************
  */
 public class UIHelper {
-//
-//    /**
-//     * 登录
-//     *
-//     * @param context
-//     */
-//    public static void showLoginAct(Context context) {
-//        Intent intent = new Intent(context, LoginActivity.class);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-//        context.startActivity(intent);
-//    }
-//
-//    /**
-//     * 显示 主界面
-//     */
-//    public static void showMyMainAct(Context context) {
-//        Intent intent = new Intent(context, Main2Activity.class);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-//        context.startActivity(intent);
-//    }
-
 
     public static void showUserGuideAct(Context mContext) {
         mContext.startActivity(new Intent(mContext, UserGuideActivity.class));
@@ -74,11 +45,6 @@ public class UIHelper {
 
     }
 
-//    public static void showUserAvatarUpdateAct(Context mContext) {
-//        mContext.startActivity(new Intent(mContext, UserAvatarUpdateActivity.class));
-//    }
-
-
     //修改用户资料
     public static void showUserInfoModifyAct(Context mContext, long userId) {
         Intent intent = new Intent(mContext, UserInfoModifyActivity.class);
@@ -112,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);
@@ -172,36 +136,6 @@ public class UIHelper {
         CommonWebViewActivity.start(context, cardUrl);
     }
 
-
-    /**
-     * 启动应用的设置
-     *
-     * @param context
-     */
-    public static void startAppSettings(Context context) {
-        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-        intent.setData(Uri.parse("package:" + context.getPackageName()));
-        context.startActivity(intent);
-    }
-
-    private static void startOtherApp(Context context, String pkgName, String launcherActivityName) {
-        ComponentName componet = new ComponentName(pkgName, launcherActivityName);
-        //pkgName 就是第三方应用的包名
-        //launcherActivityName 就是第三方应用的进入的第一个Activity
-        Intent intent = new Intent();
-        intent.setComponent(componet);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(intent);
-    }
-
-    public static void startWeixinApp(Context context) {
-        startOtherApp(context, "com.tencent.mm", "com.tencent.mm.ui.LauncherUI");
-    }
-
-    public static void startQQApp(Context context) {
-        startOtherApp(context, "com.tencent.mobileqq", "com.tencent.mobileqq.activity.SplashActivity");
-    }
-
     public static void openContactUs(Context context) {
         CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/peko/modules/contact/contact.html");
     }

app/src/main/java/com/yizhuan/erban/application/ReportManager.java

@@ -59,9 +59,14 @@ public class ReportManager implements IReportService {
     //Adjust初始化
     private void initAdjust() {
         String appToken = XChatConstants.ADJUST_APP_TOKEN;
-        String environment = AdjustConfig.ENVIRONMENT_PRODUCTION;
+        String environment;
+        if (XChatApplication.isDebug()) {
+            environment = AdjustConfig.ENVIRONMENT_SANDBOX;
+        } else {
+            environment = AdjustConfig.ENVIRONMENT_PRODUCTION;
+        }
         AdjustConfig config = new AdjustConfig(XChatApplication.instance(), appToken, environment);
-        config.setLogLevel(LogLevel.VERBOSE);
+        config.setLogLevel(LogLevel.WARN);
         Adjust.onCreate(config);
     }
 

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));
     }
 
     /**

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<IMyVoiceView, MyVoicePresen
         recyclerView = findViewById(R.id.recycler_view);
     }
 
+    @SuppressLint("CheckResult")
     private void initView() {
         if (adapter == null) {
             adapter = new MyVoiceListAdapter(null);
@@ -87,8 +87,6 @@ public class MyVoiceActivity extends BaseMvpActivity<IMyVoiceView, MyVoicePresen
                 checkPermission(Manifest.permission.RECORD_AUDIO)
                         .subscribe(result -> {
                             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<IMyVoiceView, MyVoicePresen
             MLog.error(this, "xuwakao, had not set layout id ");
             return;
         }
-        NoDataFragment fragment = NoDataFragment.newInstance(R.layout.fragment_no_data_green_with_button,
+        @SuppressLint("CheckResult") NoDataFragment fragment = NoDataFragment.newInstance(R.layout.fragment_no_data_green_with_button,
                 R.drawable.icon_common_failure_green, ResUtil.getString(R.string.erban_audio_myvoiceactivity_03), () -> {
                     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);
                                 }

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<IRecordingVoiceView,
                 Log.e("OnSwipeListener", "onSwiped--->" + "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) {

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<ActivitySoundSignatureBin
 
         soundViewModel.saveRecordLiveData.observe(this) {
             hideLoad()
-            StatisticManager.Instance().onEvent(
-                StatisticsProtocol.EVENT_MY_SOUND_RECORD_SAVE,
-                ResUtil.getString(R.string.audio_presenter_recordingvoicepresenter_02)
-            )
             refreshButtonView(SoundViewModel.STATE_RECORD_SAVE_SUCCESS)
             soundViewModel.audioState = SoundViewModel.STATE_RECORD_SAVE_SUCCESS
             SingleToastUtil.showToast(getString(R.string.update_success))

app/src/main/java/com/yizhuan/erban/audio/VoiceMatchActivity.java

@@ -36,8 +36,6 @@ import com.yizhuan.xchat_android_core.audio.bean.HistoryVoiceInfo;
 import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_core.music.model.PlayerModel;
-import com.yizhuan.xchat_android_core.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.ActivityUtil;
@@ -242,7 +240,6 @@ public class VoiceMatchActivity extends BaseViewBindingActivity<ActivityVoiceMat
                     public void onOk() {
                         // 确定使用旧版打招呼的声音上传到声音瓶子
                         stopVoice();
-                        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SOUND_MATCH_USE_OLD_POP, ResUtil.getString(R.string.erban_audio_voicematchactivity_05));
                         syncHistoryVoice(voiceInfo.getId());
                     }
 
@@ -252,7 +249,6 @@ public class VoiceMatchActivity extends BaseViewBindingActivity<ActivityVoiceMat
                         //跳转界面时停止播放声音
                         stopVoice();
 
-                        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SOUND_MATCH_USE_OLD_POP, ResUtil.getString(R.string.erban_audio_voicematchactivity_06));
                         UIHelper.showRecordVoiceAct(VoiceMatchActivity.this, REQUEST_CODE_RECORDING_VOICE_WITH_SYNC_HISTORY_VOICE, voiceInfo.getId());
 
                     }
@@ -343,7 +339,6 @@ public class VoiceMatchActivity extends BaseViewBindingActivity<ActivityVoiceMat
                 if (filterGenderBottomDialog == null) {
                     filterGenderBottomDialog = new VoiceBottleFilterGenderBottomDialog(context, filterGender, gender -> {
                         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<ActivityVoiceMat
     }
 
     private void showDialogWithHasLimit(boolean isRight) {
-        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SOUND_MATCH_RECORD_POP, isRight ? ResUtil.getString(R.string.erban_audio_voicematchactivity_016) : ResUtil.getString(R.string.erban_audio_voicematchactivity_017));
         String showMessage;
         if (isRight) {
             showMessage = ResUtil.getString(R.string.erban_audio_voicematchactivity_018);
@@ -571,11 +565,6 @@ public class VoiceMatchActivity extends BaseViewBindingActivity<ActivityVoiceMat
     }
 
     private void likeOrUnlikeVoice(VoiceMatchInfo info, boolean isRight, boolean needLoading) {
-        if (isRight) {
-            StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SOUND_MATCH_LIKE, ResUtil.getString(R.string.erban_audio_voicematchactivity_021));
-        } else {
-            StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SOUND_MATCH_UNLIKE, ResUtil.getString(R.string.erban_audio_voicematchactivity_022));
-        }
         AudioModel.get().likeOrUnlikeVoice(AuthModel.get().getCurrentUid(), info.getId(), isRight ? 1 : 0)
                 .compose(bindUntilEvent(ActivityEvent.DESTROY))
                 .subscribe(new DontWarnObserver<String>() {

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<IRecordingVoiceVie
                                 return;
                             }
                             if (error == null) {
-                                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MY_SOUND_RECORD_SAVE, ResUtil.getString(R.string.audio_presenter_recordingvoicepresenter_02));
                                 showNormalState();// 提交声音成功，显示初始状态
                                 getMvpView().hideLoadingView();// 提交声音成功时
 

app/src/main/java/com/yizhuan/erban/audio/view/BottleLayout.java

@@ -26,8 +26,6 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
 import com.yizhuan.xchat_android_constants.XChatConstants;
 import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.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_core.utils.net.RxHelper;
@@ -413,22 +411,18 @@ public class BottleLayout extends FrameLayout {
             if (VmSoundManager.get().getHelper().isPreparing()) {
                 VmSoundManager.get().getHelper().endPlay();
                 resetSoundPlayStatus();
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SOUND_MATCH_SUSPEND, ResUtil.getString(R.string.audio_view_bottlelayout_01));
                 return;
             }
             if (VmSoundManager.get().getHelper().isPlaying()) {
                 VmSoundManager.get().getHelper().pausePlay();
                 plivPlay.setImageResource(R.drawable.icon_voice_to_start);
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SOUND_MATCH_SUSPEND, ResUtil.getString(R.string.audio_view_bottlelayout_02));
                 return;
             }
             if (VmSoundManager.get().getHelper().isPause()) {
                 VmSoundManager.get().getHelper().continuePlay();
                 plivPlay.setImageResource(R.drawable.icon_voice_to_stop);
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SOUND_MATCH_SUSPEND, ResUtil.getString(R.string.audio_view_bottlelayout_03));
                 return;
             }
-            StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SOUND_MATCH_SUSPEND, ResUtil.getString(R.string.audio_view_bottlelayout_04));
             startPlay();
         });
 

app/src/main/java/com/yizhuan/erban/avroom/ButtonItemFactory.java

@@ -31,8 +31,6 @@ import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDat
 import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
 import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
 import com.yizhuan.xchat_android_core.statistic.StatLogKey;
-import com.yizhuan.xchat_android_core.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.model.SuperAdminModel;
 import com.yizhuan.xchat_android_core.super_admin.util.SAdminOptUtil;
@@ -272,7 +270,6 @@ public class ButtonItemFactory {
                 NimP2PMessageActivity.start(context, account);
             }
 
-            StatisticManager.Instance().onEvent(StatisticsProtocol.DATA_CARD_CHAT, ResUtil.getString(R.string.erban_avroom_buttonitemfactory_03));
         });
     }
 
@@ -302,7 +299,6 @@ public class ButtonItemFactory {
         return new ViewItem(ResUtil.getString(R.string.erban_avroom_buttonitemfactory_05), R.drawable.icon_dialog_kickout_room, new ViewItem.OnClickListener() {
             @Override
             public void onClick() {
-                StatisticManager.Instance().onEvent(StatisticsProtocol.data_card_kickout_room_click, ResUtil.getString(R.string.erban_avroom_buttonitemfactory_06));
 
                 String tips = (AvRoomDataManager.get().isGamePlaying(Long.parseLong(account)) ? ResUtil.getString(R.string.erban_avroom_buttonitemfactory_07) : "") + ResUtil.getString(R.string.erban_avroom_buttonitemfactory_08);
                 if (VipHelper.notKick(userInfo)) {
@@ -347,7 +343,7 @@ public class ButtonItemFactory {
                                     return;
                                 }
                                 IMNetEaseManager.get().kickMemberFromRoomBySdk(JavaUtil.str2long(roomId),
-                                        JavaUtil.str2long(account), reason)
+                                                JavaUtil.str2long(account), reason)
                                         .subscribe((s, throwable) -> {
                                             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();
         });
     }

app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java

@@ -120,8 +120,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;
@@ -249,7 +247,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         intent.putExtra(Constants.ROOM_UID, roomInfo.getUid());
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(intent);
-        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_INTO_ROOM_CLICK, ResUtil.getString(R.string.avroom_activity_avroomactivity_02));
     }
 
     public static void startForFromType(Context context,
@@ -280,7 +277,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         }
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(intent);
-        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_INTO_ROOM_CLICK, ResUtil.getString(R.string.avroom_activity_avroomactivity_04));
     }
 
     public static void setBackBg(Context context, RoomInfo roomInfo, SVGAImageView svgaRoomBg, String[] bgPicture) {
@@ -423,9 +419,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
                 .compose(bindToLifecycle())
                 .subscribe(this::onRoomEventReceive);
 
-        if (roomUid != AuthModel.get().getCurrentUid()) {
-            StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ENTERROOM, ResUtil.getString(R.string.avroom_activity_avroomactivity_05));
-        }
         EventBus.getDefault().register(this);
 
         if (mAdapter == null) {
@@ -1133,7 +1126,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
     public void onRoomTaskTipsEvent(RoomTaskTipsEvent event) {
         if (TextUtils.isEmpty(event.getTaskCompleteMsg()) || TextUtils.isEmpty(event.getTaskUrl()))
             return;
-        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_TASK_TOAST_SHOW, ResUtil.getString(R.string.avroom_activity_avroomactivity_012));
         if (llTaskTips == null) {
             llTaskTips = (LinearLayout) vsTaskTips.inflate();
         }
@@ -1142,7 +1134,6 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
         TextView tvMsg = llTaskTips.findViewById(R.id.tv_tips_text);
         tvMsg.setText(event.getTaskCompleteMsg());
         llTaskTips.setOnClickListener(v -> {
-            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());
         });

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<ICreatePKView, CreatePKPre
                             public void onOk() {
                                 getDialogManager().showProgressDialog(CreatePKActivity.this);
                                 getMvpPresenter().createPKAgain(
-                                        redTeamMember,
-                                        blueTeamMember
-                                )
+                                                redTeamMember,
+                                                blueTeamMember
+                                        )
                                         .subscribe(new SingleObserver<String>() {
                                             @Override
                                             public void onSubscribe(Disposable d) {
@@ -285,11 +283,6 @@ public class CreatePKActivity extends BaseMvpActivity<ICreatePKView, CreatePKPre
 
                                             @Override
                                             public void onSuccess(String s) {
-                                                StatisticManager.Instance().onEvent(
-                                                        CreatePKActivity.this,
-                                                        StatisticsProtocol.ROOM_CREATE_A_PK_AGAIN,
-                                                        ResUtil.getString(R.string.avroom_activity_createpkactivity_03),
-                                                        null);
 
                                                 toast(s);
                                                 getDialogManager().dismissDialog();
@@ -351,9 +344,9 @@ public class CreatePKActivity extends BaseMvpActivity<ICreatePKView, CreatePKPre
     private void createPk() {
         getDialogManager().showProgressDialog(CreatePKActivity.this);
         getMvpPresenter().createPK(
-                redTeamMember,
-                blueTeamMember
-        )
+                        redTeamMember,
+                        blueTeamMember
+                )
                 .subscribe(new SingleObserver<String>() {
                     @Override
                     public void onSubscribe(Disposable d) {
@@ -362,11 +355,6 @@ public class CreatePKActivity extends BaseMvpActivity<ICreatePKView, CreatePKPre
 
                     @Override
                     public void onSuccess(String s) {
-                        StatisticManager.Instance().onEvent(
-                                CreatePKActivity.this,
-                                StatisticsProtocol.ROOM_CREATE_A_PK,
-                                ResUtil.getString(R.string.avroom_activity_createpkactivity_05),
-                                null);
 
                         toast(s);
                         getDialogManager().dismissDialog();

app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java

@@ -45,8 +45,6 @@ import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg;
 import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
 import com.yizhuan.xchat_android_core.room.model.RoomSettingModel;
 import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
-import com.yizhuan.xchat_android_core.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_library.base.factory.CreatePresenter;
 import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack;
@@ -55,7 +53,6 @@ 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.codec.DESUtils;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -375,9 +372,6 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
                                 @Override
                                 public void onOk() {
                                     save(null, null, null, true, false);
-
-                                    StatisticManager.Instance().onEvent(BasicConfig.INSTANCE.getAppContext(),
-                                            StatisticsProtocol.EVENT_ROOM_CLOSE_GIFT_EFFECTS_CLICK, ResUtil.getString(R.string.avroom_activity_roomsettingactivity_011), null);
                                 }
                             });
                     return;
@@ -438,9 +432,6 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
                                     getMvpPresenter().openQueuingMicMode();
                                 }
                             });
-
-                    StatisticManager.Instance().onEvent(BasicConfig.INSTANCE.getAppContext(),
-                            StatisticsProtocol.EVENT_ROOM_OPEN_PLATOON_CLICK, ResUtil.getString(R.string.avroom_activity_roomsettingactivity_019), null);
                 } else {
                     getDialogManager().showOkCancelWithTitleDialog(ResUtil.getString(R.string.avroom_activity_roomsettingactivity_020),
                             new SpannableString(ResUtil.getString(R.string.avroom_activity_roomsettingactivity_021)),
@@ -471,7 +462,6 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
                                 @Override
                                 public void onOk() {
                                     getMvpPresenter().openRoomPureMode();
-                                    StatisticManager.Instance().onEvent(StatisticsProtocol.ROOM_OPEN_PURE_MODE, ResUtil.getString(R.string.avroom_activity_roomsettingactivity_028));
                                 }
                             });
                 } else {

app/src/main/java/com/yizhuan/erban/avroom/dialog/NewUserGiftDialog.kt

@@ -1,21 +1,15 @@
 package com.yizhuan.erban.avroom.dialog
 
-import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseDialog
 import com.yizhuan.erban.databinding.DialogNewUserGiftBinding
 import com.yizhuan.erban.ui.utils.load
 import com.yizhuan.xchat_android_core.gift.bean.GiftInfo
-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
 
 class NewUserGiftDialog(val giftInfo: GiftInfo) :
     BaseDialog<DialogNewUserGiftBinding>() {
 
     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)

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

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

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

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<DialogFirstChargeBinding>(),
             } else {
                 CommonWebViewActivity.start(
                     context,
-                    UriProvider.getOfficialPay(6, DeviceConfig.getDeviceId(context))
+                    UriProvider.getOfficialPay(6, DeviceUtil.getDeviceId(context))
                 )
             }
         }

app/src/main/java/com/yizhuan/erban/avroom/firstcharge/SelectPayTypeDialog.kt

@@ -1,78 +0,0 @@
-package com.yizhuan.erban.avroom.firstcharge
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.Gravity
-import android.view.View
-import android.view.WindowManager
-import com.yizhuan.erban.R
-import com.yizhuan.erban.base.BaseDialog
-import com.yizhuan.erban.databinding.DialogSelectPayTypeBinding
-import com.yizhuan.xchat_android_core.pay.PayModel
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
-import com.yizhuan.xchat_android_library.utils.ResUtil
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil
-
-/**
- * 充值方式选择弹窗
- */
-@ActLayoutRes(R.layout.dialog_select_pay_type)
-class SelectPayTypeDialog : BaseDialog<DialogSelectPayTypeBinding>() {
-
-    private val chargeProdId by lazy { requireArguments().getString("chargeProdId", "") }
-    private val descText by lazy { requireArguments().getString("descText", "") }
-    private var removeView: View? = null
-
-    companion object {
-
-        @JvmStatic
-        fun newInstance(chargeProdId: String, descText: String): SelectPayTypeDialog {
-            return SelectPayTypeDialog().apply {
-                arguments = Bundle().apply {
-                    putString("chargeProdId", chargeProdId)
-                    putString("descText", descText)
-                }
-            }
-        }
-    }
-
-    private var payChannel = ""
-
-    override fun onStart() {
-        width = WindowManager.LayoutParams.MATCH_PARENT
-        gravity = Gravity.BOTTOM
-        super.onStart()
-    }
-
-    @SuppressLint("CheckResult")
-    override fun init() {
-        PayModel.get().walletInfo
-            .compose(bindToLifecycle())
-            .subscribe({
-                //setWalletData(it)
-            }, {
-                SingleToastUtil.showToast(it.message)
-                it.printStackTrace()
-            })
-        binding.tvDesc.text = descText
-
-        binding.tvConfirm.setOnClickListener {
-            if (payChannel.isEmpty()) {
-                SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_firstcharge_selectpaytypedialog_01))
-                return@setOnClickListener
-            }
-            dismissAllowingStateLoss()
-        }
-
-        binding.tvMore.setOnClickListener {
-            removeView?.let {
-                binding.rg.addView(it)
-                binding.tvMore.visibility = View.GONE
-            }
-        }
-
-        binding.ivClose.setOnClickListener {
-            dismissAllowingStateLoss()
-        }
-    }
-}

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<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
             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<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
         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<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
                     callback.onSuccess()
                 }
             }
-
-        if (AvRoomDataManager.get().isCpRoom) {
-            StatisticManager.Instance()
-                .onEvent(StatisticsProtocol.roomcp_gift_open_click, "禮物面板按鈕")
-        }
     }
 
     private fun onUpMicro() {
@@ -923,11 +899,6 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
             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<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
             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<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
     }
 
     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<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
         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<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
                 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<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
         }
 
         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<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
             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<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
 
         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)
         }
     }

app/src/main/java/com/yizhuan/erban/avroom/fragment/GameRoomFragment.kt

@@ -1,196 +0,0 @@
-package com.yizhuan.erban.avroom.fragment
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.View
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import androidx.databinding.DataBindingUtil
-import com.yizhuan.erban.R
-import com.yizhuan.erban.avroom.adapter.GameMicroViewAdapter
-import com.yizhuan.erban.avroom.adapter.GameMiniMicroViewAdapter
-import com.yizhuan.erban.avroom.adapter.OnMicroItemClickListener
-import com.yizhuan.erban.avroom.firstcharge.FirstChargePrizeDialog
-import com.yizhuan.erban.avroom.game.GameDelegate
-import com.yizhuan.erban.avroom.game.OnGameStatusChangeListener
-import com.yizhuan.erban.avroom.presenter.GameRoomPresenter
-import com.yizhuan.erban.avroom.view.IGameRoomView
-import com.yizhuan.erban.databinding.FragmentGameRoomBinding
-import com.yizhuan.erban.ui.widget.GiftDialog.OnGiftDialogBtnClickListener
-import com.yizhuan.xchat_android_core.home.bean.BannerInfo
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
-import com.yizhuan.xchat_android_core.music.model.PlayerModel
-import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent
-import com.yizhuan.xchat_android_core.room.event.FinishAvRoomEvent
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
-
-/**
- * 轰趴房间
- *
- * @author chenran
- * @date 2017/7/26
- */
-@CreatePresenter(GameRoomPresenter::class)
-class GameRoomFragment : BaseRoomFragment<IGameRoomView?, GameRoomPresenter?>(),
-    View.OnClickListener, OnGiftDialogBtnClickListener, IGameRoomView, OnMicroItemClickListener,
-    OnGameStatusChangeListener {
-
-    companion object {
-        @JvmStatic
-        fun newInstance(): GameRoomFragment {
-            val roomFragment = GameRoomFragment()
-            val bundle = Bundle()
-            roomFragment.arguments = bundle
-            return roomFragment
-        }
-    }
-
-    private lateinit var gameBinding: FragmentGameRoomBinding
-    private lateinit var gameDelegate: GameDelegate
-    private var isShowMiniMic = false
-
-    override fun getRootLayoutId(): Int {
-        return R.layout.fragment_game_room
-    }
-
-    override fun onFindViews() {
-        super.onFindViews()
-        gameBinding = DataBindingUtil.bind(mView)!!
-        gameBinding.lifecycleOwner = this
-        gameBinding.click = this
-        gameBinding.ktvModel = false
-        gameDelegate = GameDelegate(
-            requireActivity(),
-            gameBinding.flGameContainer,
-            AvRoomDataManager.get().mCurrentRoomInfo?.mgId
-        )
-        gameDelegate.setOnGameStatusChangeListener(this)
-    }
-
-
-    @SuppressLint("CheckResult")
-    override fun initiate() {
-        gameBinding.microView.bindAdapter(GameMicroViewAdapter(context))
-        super.initiate()
-        //游戏模式暂时不需要这个
-        PlayerModel.get().stop()
-        gameBinding.roomInfo = AvRoomDataManager.get().mCurrentRoomInfo
-        mvpPresenter?.getBannerList()
-        gameBinding.tvShowMiniMic.setOnClickListener { showMiniMic() }
-        gameBinding.ivShowMic.setOnClickListener { showMic() }
-    }
-
-    private fun showMiniMic() {
-        if (isShowMiniMic) return
-        isShowMiniMic = true
-        gameBinding.microView.bindAdapter(GameMiniMicroViewAdapter(context).apply {
-            setOnClick { showMic() }
-        })
-        gameBinding.tvShowMiniMic.isVisible = false
-        gameBinding.microView.postDelayed({
-            gameBinding.ivShowMic.isVisible = true
-            gameBinding.llMicView.setBackgroundResource(R.drawable.bg_mini_mic_entrance)
-        }, 100)
-    }
-
-    private fun showMic() {
-        if (!isShowMiniMic) return
-        isShowMiniMic = false
-        gameBinding.microView.bindAdapter(GameMicroViewAdapter(context))
-        gameBinding.tvShowMiniMic.isVisible = true
-        gameBinding.llMicView.background = null
-        gameBinding.ivShowMic.isVisible = false
-    }
-
-    override fun onSetListener() {
-        super.onSetListener()
-        bottomView.setBottomViewListener(BaseRoomBottomViewWrapper())
-    }
-
-    override fun updateView() {
-        super.updateView()
-        gameDelegate.updateGame(AvRoomDataManager.get().mCurrentRoomInfo?.mgId)
-        gameBinding.roomInfo = AvRoomDataManager.get().mCurrentRoomInfo
-        if (isSixMic()) {
-            gameBinding.tvShowMiniMic.isVisible = !isShowMiniMic
-            gameBinding.ivShowMic.isVisible = isShowMiniMic
-        } else {
-            showMic()
-            gameBinding.tvShowMiniMic.isInvisible = true
-            gameBinding.ivShowMic.isVisible = false
-        }
-        gameBinding.microView.adapter.notifyDataSetChanged()
-    }
-
-    override fun onGameStart() {
-        if (isSixMic()) {
-            showMiniMic()
-        }
-    }
-
-    override fun onGameEnd() {
-        if (isSixMic()) {
-            showMic()
-        }
-    }
-
-    private fun isSixMic(): Boolean {
-        return AvRoomDataManager.get().mgMicNum == AvRoomDataManager.GAME_DEF_MIC_COUNT
-    }
-
-    override fun onSendMsgSuccess(msg: String?) {
-        super.onSendMsgSuccess(msg)
-        msg?.let {
-            if (AvRoomDataManager.get().isSelfGamePlaying) {
-                gameDelegate.hitTheMark(msg)
-            }
-        }
-    }
-
-    override fun onShowBanner(dialogInfos: List<BannerInfo>) {
-        initRoomAct(gameBinding.activityImg, dialogInfos)
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onFinishAvRoomEvent(event: FinishAvRoomEvent) {
-        gameDelegate.exitGame()
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onFirstRechargeEvent(event: FirstChargeEvent) {
-        FirstChargePrizeDialog(
-            requireContext(),
-            event.chargeProdTitle,
-            event.firstChargeRewardList
-        ).openDialog()
-    }
-
-    override fun onStart() {
-        super.onStart()
-        gameDelegate.onStart()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        gameDelegate.onResume()
-    }
-
-
-    override fun onPause() {
-        super.onPause()
-        gameDelegate.onPause()
-    }
-
-    override fun onStop() {
-        super.onStop()
-        gameDelegate.onStop()
-    }
-
-    override fun onDestroy() {
-        gameDelegate.onDestroy()
-        super.onDestroy()
-    }
-
-}

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));
@@ -407,9 +405,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
             Fragment tempFragment = roomFragment;
             switch (currentRoomInfo.getType()) {
                 case RoomInfo.ROOMTYPE_GAME:
-                    if (!(tempFragment instanceof GameRoomFragment)) {
-                        tempFragment = GameRoomFragment.newInstance();
-                    }
+                    toast(getString(R.string.room_game_is_not_open_yet));
                     break;
                 case RoomInfo.ROOM_TYPE_SINGLE:
                     if (!(tempFragment instanceof SingleRoomFragment)) {
@@ -546,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));
                     }
                 });
 
@@ -573,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

app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java

@@ -861,7 +861,7 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
                 !MarketVerifyModel.get().isMarketChecking() &&
                 !AvRoomDataManager.get().isOpenPKMode() &&
                 !AvRoomDataManager.get().isCpRoom()) {
-            gameBinding.layoutDragon.setVisibility(View.VISIBLE);
+//            gameBinding.layoutDragon.setVisibility(View.VISIBLE);
             if (AvRoomDataManager.get().haveStartDragon) {
                 gameBinding.playDragon.setVisibility(View.VISIBLE);
                 gameBinding.cancelDragon.setVisibility(View.VISIBLE);

app/src/main/java/com/yizhuan/erban/avroom/game/AppConfig.java

@@ -1,15 +0,0 @@
-/*
-  Copyright © Sud.Tech
-  https://sud.tech
- */
-package com.yizhuan.erban.avroom.game;
-
-import com.yizhuan.xchat_android_library.BuildConfig;
-
-public class AppConfig {
-
-    protected static final String APP_ID = "1578948593831571457";
-    protected static final String APP_KEY = "J9lHOXvFWkAZiTfl4SK7IGt0wDnW3fWd";
-    protected static boolean isTestEnv = BuildConfig.DEBUG;
-
-}

app/src/main/java/com/yizhuan/erban/avroom/game/GameDelegate.kt

@@ -1,667 +0,0 @@
-package com.yizhuan.erban.avroom.game
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Context
-import android.os.Handler
-import android.os.Looper
-import android.text.TextUtils
-import android.util.Log
-import android.view.View
-import android.view.ViewTreeObserver.OnGlobalLayoutListener
-import android.widget.FrameLayout
-import com.google.gson.Gson
-import com.netease.nim.uikit.common.util.sys.ScreenUtil
-import com.yizhuan.xchat_android_core.auth.AuthModel
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
-import com.yizhuan.xchat_android_core.room.game.GameCfg
-import com.yizhuan.xchat_android_core.room.game.GameModel
-import com.yizhuan.xchat_android_core.room.game.GameStatus
-import com.yizhuan.xchat_android_core.room.model.HomePartyModel
-import com.yizhuan.xchat_android_core.user.UserModel
-import com.yizhuan.xchat_android_core.utils.LogUtils
-import com.yizhuan.xchat_android_core.utils.net.RxHelper
-import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil
-import okhttp3.*
-import org.json.JSONException
-import org.json.JSONObject
-import tech.sud.mgp.core.*
-import java.util.*
-
-class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: Long?) {
-
-    private val TAG = "GameDelegate"
-    private var APP_CODE = ""
-
-    private val mRoomID = AvRoomDataManager.get().roomUid.toString()
-    private val mLanguage = "zh-TW" //語言
-
-    //調用遊戲SDK的接口,成功加載遊戲後可用:
-    private var iSudFSTAPP: ISudFSTAPP? = null
-
-    private val gson = Gson()
-
-    //小遊戲ID
-    private var mMGID = 0L
-
-    //通用狀態-遊戲，關鍵詞
-    private var mKeyWord: String? = null
-    private val mUid = AuthModel.get().currentUid.toString()
-
-    private val homePartyModel = HomePartyModel()
-
-    private var onGameStatusChangeListener: OnGameStatusChangeListener? = null
-
-    fun setOnGameStatusChangeListener(onGameStatusChangeListener: OnGameStatusChangeListener) {
-        this.onGameStatusChangeListener = onGameStatusChangeListener
-    }
-
-    private val loginCallback: AppLoginListener =
-        object : AppLoginListener {
-            override fun onLoginFailure(err: String?) {
-                SingleToastUtil.showToast(err)
-            }
-
-            override fun onLoginSuccess(new_code: String, expire_Date: Long) {
-                APP_CODE = new_code
-                Handler(Looper.getMainLooper()).post {
-                    //初始化遊戲SDK
-                    initGameSDK(
-                        activity,
-                        AppConfig.APP_ID,
-                        AppConfig.APP_KEY,
-                        AppConfig.isTestEnv
-                    )
-                }
-            }
-
-        }
-
-    init {
-        mMGID = mgId ?: 0L
-        login(loginCallback)
-    }
-
-    fun updateGame(mgId: Long?) {
-        if (mgId == null || mgId == 0L || mgId == mMGID || iSudFSTAPP == null) return
-        mMGID = mgId
-        updateMyMicQueue(GameStatus.STATUS_NOT_JOIN)
-        loadMG(activity, mUid, mRoomID, APP_CODE, mMGID, mLanguage)
-    }
-
-    fun exitGame() {
-        UserModel.get().cacheLoginUserInfo?.gameStatus = GameStatus.STATUS_NOT_JOIN
-        notifySelfPlayingState(false)
-        notifySelfInState(false)
-    }
-
-    /**
-     * 例如"你畫我猜"遊戲的文字命中
-     */
-    fun hitTheMark(msg: String) {
-        mKeyWord?.let {
-            if (msg.contains(it)) {
-                notifySelfTextHit(it, msg)
-            }
-        }
-    }
-
-    /**
-     * "接入方客戶端"登陸接口, 從"接入方服務端"獲得Code
-     * "接入方服務端"是通過"服務端接入SDK"獲得Code來返回給"接入方客戶端"的
-     * @param listener
-     */
-    @SuppressLint("CheckResult")
-    private fun login(listener: AppLoginListener) {
-        GameModel.getGameCode()
-            .compose(RxHelper.bindContext(activity))
-            .subscribe({
-                listener.onLoginSuccess(it.code, it.expireDate)
-            }, {
-                listener.onLoginFailure(it.message)
-            })
-
-    }
-
-    /**
-     * 1，初始化遊戲SDK
-     *
-     * @param context   上下文
-     * @param appID     appID
-     * @param appKey    appKey
-     * @param isTestEnv 是否是測試環境，true：測試環境，false：正式環境
-     */
-    private fun initGameSDK(context: Context, appID: String, appKey: String, isTestEnv: Boolean) {
-        SudMGP.initSDK(context, appID, appKey, isTestEnv, object : ISudListenerInitSDK {
-            override fun onSuccess() {
-                loadMG(activity, mUid, mRoomID, APP_CODE, mMGID, mLanguage)
-            }
-
-            override fun onFailure(code: Int, errInfo: String) {
-                showToast("初始化遊戲SDK失敗:$code--errInfo:$errInfo")
-            }
-        })
-
-    }
-
-    /**
-     * 2，加載遊戲
-     *
-     * @param activity 上下文Activity
-     * @param userID   用戶ID，業務系統保證每個用戶擁有唯一ID
-     * @param roomID   房間ID，進入同一房間內的
-     * @param code     令牌
-     * @param mgID     小遊戲ID
-     * @param language 遊戲語言 現支持，簡體：zh-CN 繁體：zh-TW 英語：en-US 馬來語：ms-MY
-     */
-    private fun loadMG(
-        activity: Activity,
-        userID: String,
-        roomID: String,
-        code: String,
-        mgID: Long,
-        language: String
-    ) {
-        iSudFSTAPP?.destroyMG()
-        iSudFSTAPP = SudMGP.loadMG(activity, userID, roomID, code, mgID, language, mISudFSMMG)
-        addGameView(iSudFSTAPP!!.gameView)
-    }
-
-    /**
-     * 3，將遊戲view添加到我們的布局當中
-     *
-     * @param gameView
-     */
-    private fun addGameView(gameView: View) {
-        container.removeAllViews()
-        container.addView(gameView)
-    }
-
-    private fun showToast(content: String?) {
-        SingleToastUtil.showToast(content)
-    }
-
-
-    /**
-     * 通知"文字命中狀態"到遊戲端
-     *
-     * @param iSudFSTAPP
-     * @param keyWord
-     */
-    private fun notifySelfTextHit(keyWord: String?, msg: String) {
-        LogUtils.d("notifySelfTextHit")
-        try {
-            //狀態名稱
-            val state: String = SudMGPAPPState.APP_COMMON_SELF_TEXT_HIT
-
-            //狀態數據
-            val jsonObject = JSONObject()
-            jsonObject.put("isHit", true) // true 命中，false 未命中
-            jsonObject.put("keyWord", keyWord) // true 命中，false 未命中
-            jsonObject.put("text", msg) // 聊天原始內容，這裏的值只是一個示例，意指內容當中包含關鍵詞則命中，具體按業務規則定。
-            val dataJson = jsonObject.toString()
-            //調用接口
-            iSudFSTAPP?.notifyStateChange(state, dataJson, null)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    /**
-     * 設置當前關鍵詞
-     *
-     * @param keyWord
-     */
-    private fun setKeyWord(keyWord: String?) {
-        mKeyWord = keyWord
-    }
-
-    /**
-     * 遊戲SDK調用app的接口
-     */
-    private val mISudFSMMG: ISudFSMMG = object : ISudFSMMG {
-
-        override fun onGameLog(p0: String?) {
-            LogUtils.d(p0)
-        }
-
-        override fun onGameStarted() {
-        }
-
-        override fun onGameDestroyed() {
-        }
-
-        /**
-         * 回調此方法，表示令牌過期，此時需要刷新令牌並使用ISudFSMStateHandle回調
-         * @param handle
-         * @param dataJson
-         */
-        override fun onExpireCode(handle: ISudFSMStateHandle, dataJson: String) {
-            login(object : AppLoginListener {
-                override fun onLoginFailure(err: String?) {
-
-                }
-
-                override fun onLoginSuccess(new_code: String, expire_Date: Long) {
-                    APP_CODE = new_code
-                    try {
-                        val jsonObject = JSONObject()
-                        jsonObject.put("ret_code", 0)
-                        jsonObject.put("ret_msg", "success")
-                        handle.success(jsonObject.toString())
-                    } catch (e: JSONException) {
-                        e.printStackTrace()
-                    }
-                    iSudFSTAPP?.updateCode(APP_CODE, null)
-                }
-
-            })
-        }
-
-        /**
-         * 處理獲取遊戲視圖信息
-         * @param handle
-         * @param dataJson
-         */
-        override fun onGetGameViewInfo(handle: ISudFSMStateHandle, dataJson: String) {
-            //拿到遊戲View的寬高
-            val gameViewWidth = container.measuredWidth
-            val gameViewHeight = container.measuredHeight
-            if (gameViewWidth > 0 && gameViewHeight > 0) {
-                notifyGameViewInfo(handle, gameViewWidth, gameViewHeight)
-                return
-            }
-
-            //如果遊戲View未加載完成，則監聽加載完成時回調
-            container.viewTreeObserver.addOnGlobalLayoutListener(object : OnGlobalLayoutListener {
-                override fun onGlobalLayout() {
-                    container.viewTreeObserver.removeOnGlobalLayoutListener(this)
-                    val width = container.measuredWidth
-                    val height = container.measuredHeight
-                    notifyGameViewInfo(handle, width, height)
-                }
-            })
-        }
-
-        override fun onGetGameCfg(handle: ISudFSMStateHandle?, p1: String?) {
-            handle?.success(gson.toJson(GameCfg()))
-        }
-
-        /**
-         * 通知遊戲，遊戲視圖信息
-         * @param handle
-         * @param gameViewWidth
-         * @param gameViewHeight
-         */
-        private fun notifyGameViewInfo(
-            handle: ISudFSMStateHandle,
-            gameViewWidth: Int,
-            gameViewHeight: Int
-        ) {
-            try {
-                val jsonObject = JSONObject()
-                jsonObject.put("ret_code", 0)
-                jsonObject.put("ret_msg", "success")
-
-                //遊戲View大小
-                val viewSize = JSONObject()
-                viewSize.put("width", gameViewWidth)
-                viewSize.put("height", gameViewHeight)
-                jsonObject.put("view_size", viewSize)
-
-                //遊戲安全操作區域
-                val viewGameRect = JSONObject()
-                viewGameRect.put("left", 0)
-                viewGameRect.put("top", ScreenUtil.dip2px(200f))
-                viewGameRect.put("right", 0)
-                viewGameRect.put("bottom", ScreenUtil.dip2px(200f))
-                jsonObject.put("view_game_rect", viewGameRect)
-
-                //通知遊戲
-                val json = jsonObject.toString()
-                Log.d(TAG, "notifyGameViewInfo:$json")
-                handle.success(json)
-            } catch (e: JSONException) {
-                e.printStackTrace()
-            }
-        }
-
-        /**
-         * 遊戲狀態變化
-         * @param handle
-         * @param state     狀態名
-         * @param dataJson  狀態數據，json字符串
-         */
-        override fun onGameStateChange(
-            handle: ISudFSMStateHandle,
-            state: String,
-            dataJson: String
-        ) {
-            Log.d(TAG, "onGameStateChange state:$state--dataJson:$dataJson")
-            when (state) {
-                //SudMGPMGState.MG_COMMON_PUBLIC_MESSAGE -> showToast("遊戲：公屏消息")
-                SudMGPMGState.MG_COMMON_KEY_WORD_TO_HIT -> {
-                    if (TextUtils.isEmpty(dataJson)) {
-                        setKeyWord(null)
-                    } else {
-                        try {
-                            val jsonObject = JSONObject(dataJson)
-                            if (jsonObject.isNull("word")) {
-                                setKeyWord(null)
-                            } else {
-                                val keyWord = jsonObject.getString("word")
-                                setKeyWord(keyWord)
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-                    }
-                }
-                SudMGPMGState.APP_COMMON_SELF_CLICK_JOIN_BTN -> {
-
-                    try {
-                        val jsonObject = JSONObject(dataJson)
-                        val seatIndex = jsonObject.optInt("seatIndex", -1)
-                        updateMyMicQueue(GameStatus.STATUS_NOT_READY, true, seatIndex)
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    }
-
-                }
-                SudMGPMGState.APP_COMMON_SELF_CLICK_START_BTN -> {
-                    notifySelfPlayingState(true)
-                }
-                SudMGPMGState.MG_COMMON_GAME_STATE -> handleGameState(dataJson)
-            }
-        }
-
-        /**
-         * 玩家狀態變化
-         * @param handle
-         * @param userId    玩家用戶ID
-         * @param state     狀態名
-         * @param dataJson  狀態數據，json字符串。參考文檔
-         */
-        override fun onPlayerStateChange(
-            handle: ISudFSMStateHandle,
-            userId: String,
-            state: String,
-            dataJson: String
-        ) {
-            Log.d(TAG, "onPlayerStateChange userId:$userId--state:$state--dataJson:$dataJson")
-            when (state) {
-                SudMGPMGState.MG_COMMON_PLAYER_IN -> handlePlayerIn(userId, dataJson)
-                SudMGPMGState.MG_COMMON_PLAYER_READY -> handlePlayerReady(userId, dataJson)
-                SudMGPMGState.MG_COMMON_PLAYER_CAPTAIN -> handlePlayerCaptain(dataJson)
-                SudMGPMGState.MG_COMMON_PLAYER_PLAYING -> handlePlayerPlaying(userId, dataJson)
-            }
-        }
-    }
-
-    private fun handlePlayerIn(userId: String, dataJson: String) {
-        if (userId != mUid) return
-        try {
-            val jsonObject = JSONObject(dataJson)
-            val retCode = jsonObject.getInt("retCode")
-            val isIn = jsonObject.getBoolean("isIn")
-            if (retCode != 0) {
-                return
-            }
-            if (isIn) { // 已加入
-                if (AvRoomDataManager.get().isRoomOwner) {
-                    notifySelfCaptainState(mUid)
-                }
-            } else {  // 未加入
-                var reason = 0
-                if (jsonObject.has("reason")) {
-                    reason = jsonObject.getInt("reason")
-                }
-                if (reason == 0) {
-                    updateMyMicQueue(GameStatus.STATUS_NOT_JOIN)
-                } else if (reason == 1) {
-                    updateMyMicQueue(GameStatus.STATUS_NOT_JOIN)
-                }
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun updateMyMicQueue(gameStatus: Int, isJoin: Boolean = false, seatIndex: Int = -1) {
-        UserModel.get().cacheLoginUserInfo?.gameStatus = gameStatus
-        val position = AvRoomDataManager.get().getMicPosition(mUid)
-        if (position != AvRoomDataManager.POSITON_NOT_ON_MIC) {
-            if (isJoin) notifySelfInState(true, seatIndex)
-            homePartyModel.updateMyMicQueue(
-                position,
-                AvRoomDataManager.get().roomId.toString(),
-                UserModel.get().cacheLoginUserInfo
-            ).subscribe()
-        } else if (isJoin) {
-            val upPosition = AvRoomDataManager.get().findGamePosition()
-            if (upPosition == Int.MIN_VALUE) {
-                showToast("當前遊戲人數已滿!")
-            } else {
-                UserModel.get().cacheLoginUserInfo?.gameStatus = 1
-                homePartyModel.upMicroPhone(upPosition,
-                    mUid,
-                    AvRoomDataManager.get().roomId.toString(),
-                    false, object : CallBack<String> {
-                        override fun onSuccess(data: String?) {
-                            notifySelfInState(true, seatIndex)
-                        }
-
-                        override fun onFail(code: Int, error: String?) {
-                            showToast(error)
-                        }
-
-                    })
-            }
-        }
-    }
-
-    private fun handlePlayerReady(userId: String, dataJson: String) {
-        if (userId != mUid) return
-        try {
-            val jsonObject = JSONObject(dataJson)
-            val retCode = jsonObject.getInt("retCode")
-            val isReady = jsonObject.getBoolean("isReady")
-            if (retCode != 0) {
-                return
-            }
-            updateMyMicQueue(if (isReady) GameStatus.STATUS_READY else GameStatus.STATUS_NOT_READY)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun handlePlayerCaptain(dataJson: String) {
-        try {
-            val jsonObject = JSONObject(dataJson)
-            val retCode = jsonObject.getInt("retCode")
-            if (retCode != 0) {
-                return
-            }
-
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun handleGameState(dataJson: String) {
-        try {
-            val jsonObject = JSONObject(dataJson)
-            val gameState = jsonObject.getInt("gameState")
-            if (gameState == 0) {
-                onGameStatusChangeListener?.onGameEnd()
-            } else if (gameState == 2) {
-                onGameStatusChangeListener?.onGameStart()
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun handlePlayerPlaying(userId: String, dataJson: String) {
-        if (userId != mUid) return
-        try {
-            val jsonObject = JSONObject(dataJson)
-            val retCode = jsonObject.getInt("retCode")
-            if (retCode != 0) {
-                return
-            }
-            val isPlaying = jsonObject.getBoolean("isPlaying")
-            if (isPlaying) {
-                updateMyMicQueue(GameStatus.STATUS_PLAYING)
-            } else {
-                updateMyMicQueue(GameStatus.STATUS_NOT_READY)
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun notifySelfInState(isIn: Boolean, seatIndex: Int = -1) {
-        try {
-            if (!isIn) {
-                notifySelfReadyState(false)
-            }
-            //狀態名稱
-            val state = SudMGPAPPState.APP_COMMON_SELF_IN
-            //狀態數據
-            val jsonObject = JSONObject()
-            jsonObject.put("isIn", isIn) // true 加入遊戲，false 退出遊戲
-            if (seatIndex != -1) {
-                jsonObject.put("seatIndex", seatIndex)
-            }
-            jsonObject.put("teamId", 1) //哪一隊伍(2v2,4v4)
-            val dataJson = jsonObject.toString()
-
-            //調用接口
-            iSudFSTAPP?.notifyStateChange(state, dataJson, null)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun notifySelfReadyState(isReady: Boolean) {
-        try {
-            //狀態名稱
-            val state = SudMGPAPPState.APP_COMMON_SELF_READY
-
-            //狀態數據
-            val jsonObject = JSONObject()
-            jsonObject.put("isReady", isReady) // true 準備，false 取消準備
-            val dataJson = jsonObject.toString()
-
-            //調用接口
-            iSudFSTAPP?.notifyStateChange(state, dataJson, null)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun notifySelfPlayingState(isPlaying: Boolean) {
-        try {
-            //狀態名稱
-            val state = SudMGPAPPState.APP_COMMON_SELF_PLAYING
-
-            //狀態數據
-            val jsonObject = JSONObject()
-            jsonObject.put("isPlaying", isPlaying) // true 開始遊戲，false 結束遊戲
-            val dataJson = jsonObject.toString()
-
-            //調用接口
-            iSudFSTAPP?.notifyStateChange(state, dataJson, null)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun notifySelfCaptainState(uid: String) {
-        try {
-            //狀態名稱
-            val state = SudMGPAPPState.APP_COMMON_SELF_CAPTAIN
-
-            //狀態數據
-            val jsonObject = JSONObject()
-            jsonObject.put("curCaptainUID", uid) // 必填，指定隊長uid
-            val dataJson = jsonObject.toString()
-
-            //調用接口
-            iSudFSTAPP?.notifyStateChange(state, dataJson, null)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun notifySelfKickState(uid: String) {
-        try {
-            //狀態名稱
-            val state = SudMGPAPPState.APP_COMMON_SELF_KICK
-
-            //狀態數據
-            val jsonObject = JSONObject()
-            jsonObject.put("kickedUID", uid) // 被踢用戶uid
-            val dataJson = jsonObject.toString()
-
-            //調用接口
-            iSudFSTAPP?.notifyStateChange(state, dataJson, null)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun notifySelfEndState() {
-        try {
-            //狀態名稱
-            val state = SudMGPAPPState.APP_COMMON_SELF_END
-
-            //狀態數據
-            val jsonObject = JSONObject()
-            val dataJson = jsonObject.toString()
-
-            //調用接口
-            iSudFSTAPP?.notifyStateChange(state, dataJson, null)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    fun onStart() {
-        iSudFSTAPP?.startMG() //啟動遊戲
-    }
-
-    fun onResume() {
-        iSudFSTAPP?.playMG() //開始遊戲
-    }
-
-    fun onPause() {
-        iSudFSTAPP?.pauseMG() //暫停遊戲
-    }
-
-    fun onStop() {
-        iSudFSTAPP?.stopMG() //停止遊戲
-    }
-
-    fun onDestroy() {
-        updateMyMicQueue(GameStatus.STATUS_NOT_JOIN)
-        iSudFSTAPP?.destroyMG()
-    }
-
-}
-
-internal interface AppLoginListener {
-    /**
-     * App Server 登陸失敗, App Server 不能返回CODE
-     */
-    fun onLoginFailure(err: String?)
-
-    /**
-     * App Server 登陸成功, App Server調用服務端接入SDK的API獲取Code 返回給 App
-     * App 就要用CODE和自己生成的UserID去調用SDK的初始化函數，登陸小遊戲
-     * 小遊戲登陸成功後，其UserID，就是App傳的UserID
-     */
-    fun onLoginSuccess(new_code: String, expire_Date: Long)
-}

app/src/main/java/com/yizhuan/erban/avroom/game/OnGameStatusChangeListener.kt

@@ -1,13 +0,0 @@
-package com.yizhuan.erban.avroom.game
-
- interface OnGameStatusChangeListener {
-    /**
-     * 游戏开始
-     */
-    fun onGameStart()
-
-    /**
-     * 游戏结束
-     */
-    fun onGameEnd()
-}

app/src/main/java/com/yizhuan/erban/avroom/game/SudMGPAPPState.java

@@ -1,61 +0,0 @@
-/*
-  Copyright © Sud.Tech
-  https://sud.tech
- */
-package com.yizhuan.erban.avroom.game;
-
-/**
- * Time:2021/10/19
- * Description: APP to MG 的状态定义
- */
-public class SudMGPAPPState {
-
-    // region 通用状态
-
-    /**
-     * 加入状态
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String APP_COMMON_SELF_IN = "app_common_self_in";
-
-    /**
-     * 准备状态
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String APP_COMMON_SELF_READY = "app_common_self_ready";
-
-    /**
-     * 游戏状态
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String APP_COMMON_SELF_PLAYING = "app_common_self_playing";
-
-    /**
-     * 队长状态
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String APP_COMMON_SELF_CAPTAIN = "app_common_self_captain";
-
-    /**
-     * 踢人
-     * v1.1.30.xx
-     */
-    public static final String APP_COMMON_SELF_KICK = "app_common_self_kick";
-
-    /**
-     * 结束游戏
-     * v1.1.30.xx
-     */
-    public static final String APP_COMMON_SELF_END = "app_common_self_end";
-
-    /**
-     * 麦克风状态
-     */
-    public static final String APP_COMMON_SELF_MICROPHONE = "app_common_self_microphone";
-
-    /**
-     * 文字命中状态
-     */
-    public static final String APP_COMMON_SELF_TEXT_HIT = "app_common_self_text_hit";
-
-}

app/src/main/java/com/yizhuan/erban/avroom/game/SudMGPMGState.java

@@ -1,125 +0,0 @@
-/*
-  Copyright © Sud.Tech
-  https://sud.tech
- */
-package com.yizhuan.erban.avroom.game;
-
-/**
- * Time:2021/10/19
- * Description: MG to APP 的状态定义
- */
-public class SudMGPMGState {
-
-    // region 通用状态-游戏
-
-    /**
-     * 公屏消息  （已修改）
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String MG_COMMON_PUBLIC_MESSAGE = "mg_common_public_message";
-
-    /**
-     * 关键词状态
-     */
-    public static final String MG_COMMON_KEY_WORD_TO_HIT = "mg_common_key_word_to_hit";
-
-    // endregion 通用状态-游戏
-
-
-    // region 通用状态-玩家
-
-    /**
-     * 加入状态 （已修改）
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String MG_COMMON_PLAYER_IN = "mg_common_player_in";
-
-    /**
-     * 准备状态 （已修改）
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String MG_COMMON_PLAYER_READY = "mg_common_player_ready";
-
-    /**
-     * 队长状态 （已修改）
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String MG_COMMON_PLAYER_CAPTAIN = "mg_common_player_captain";
-
-    /**
-     * 游戏状态 （已修改）
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String MG_COMMON_PLAYER_PLAYING = "mg_common_player_playing";
-
-    /**
-     * 游戏状态（已修改）
-     * 最低版本: v1.1.30.xx
-     */
-    public static final String MG_COMMON_GAME_STATE = "mg_common_game_state";
-
-    // endregion 通用状态-玩家
-
-
-    // region 碰碰我最强
-    // endregion 碰碰我最强
-
-    // region 飞刀达人
-    // endregion 飞刀达人
-
-    // region 你画我猜
-
-    /**
-     * 选词中
-     */
-    public static final String MG_DG_SELECTING = "mg_dg_selecting";
-
-    /**
-     * 作画中
-     */
-    public static final String MG_DG_PAINTING = "mg_dg_painting";
-
-    /**
-     * 错误答案
-     */
-    public static final String MG_DG_ERRORANSWER = "mg_dg_erroranswer";
-
-    /**
-     * 总积分
-     */
-    public static final String MG_DG_TOTALSCORE = "mg_dg_totalscore";
-
-    /**
-     * 本次积分
-     */
-    public static final String MG_DG_SCORE = "mg_dg_score";
-
-    // endregion 你画我猜
-
-
-    /**
-     * 加入游戏按钮点击状态
-     */
-    public static final String APP_COMMON_SELF_CLICK_JOIN_BTN = "mg_common_self_click_join_btn";
-    /**
-     * 取消加入游戏按钮点击状态
-     */
-    public static final String APP_COMMON_SELF_CLICK_CANCEL_JOIN_BTN = "mg_common_self_click_cancel_join_btn";
-    /**
-     * 准备按钮点击状态
-     */
-    public static final String APP_COMMON_SELF_CLICK_READY_BTN = "mg_common_self_click_ready_btn";
-    /**
-     * 取消准备按钮点击状态
-     */
-    public static final String APP_COMMON_SELF_CLICK_CANCEL_READY_BTN = "mg_common_self_click_cancel_ready_btn";
-    /**
-     * 开始游戏按钮点击状态
-     */
-    public static final String APP_COMMON_SELF_CLICK_START_BTN = "mg_common_self_click_start_btn";
-    /**
-     * 分享按钮点击状态
-     */
-    public static final String APP_COMMON_SELF_CLICK_SHARE_BTN = "mg_common_self_click_share_btn";
-
-}

app/src/main/java/com/yizhuan/erban/avroom/newuserchargegift/NewUserChargeGiftDialog.kt

@@ -1,196 +0,0 @@
-package com.yizhuan.erban.avroom.newuserchargegift
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.view.Gravity
-import android.view.View
-import android.view.WindowManager
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.netease.nim.uikit.common.util.sys.ScreenUtil
-import com.netease.nim.uikit.common.util.sys.TimeUtil
-import com.trello.rxlifecycle3.android.ActivityEvent
-import com.yizhuan.erban.R
-import com.yizhuan.erban.avroom.firstcharge.SelectPayTypeDialog
-import com.yizhuan.erban.base.BaseViewBindingActivity
-import com.yizhuan.erban.databinding.DialogNewUserChargeGiftBinding
-import com.yizhuan.erban.ui.setting.ModifyPwdActivity
-import com.yizhuan.erban.ui.utils.RVDelegate
-import com.yizhuan.xchat_android_core.pay.PayModel
-import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods
-import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward
-import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent
-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.CurrentTimeUtils
-import com.yizhuan.xchat_android_core.utils.toast
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
-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
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
-import java.util.concurrent.TimeUnit
-
-@ActLayoutRes(R.layout.dialog_new_user_charge_gift)
-class NewUserChargeGiftDialog : BaseViewBindingActivity<DialogNewUserChargeGiftBinding>() {
-
-    private var goodsList: List<FirstChargeGoods>? = null
-    private var currGoods: FirstChargeGoods? = null
-    private lateinit var rewardAdapter: RewardAdapter
-    private lateinit var rvDelegate: RVDelegate<FirstChargeReward>
-
-    companion object {
-        @JvmStatic
-        fun start(context: Context) {
-            val starter = Intent(context, NewUserChargeGiftDialog::class.java)
-            context.startActivity(starter)
-        }
-
-        private const val BIND_CODE_GOLD = 200
-    }
-
-    @SuppressLint("CheckResult")
-    override fun init() {
-        //這裏的height用MATCH_PARENT狀態欄會被頂上去,不知道什麽鬼
-        val height = ScreenUtil.screenHeight - ScreenUtil.getStatusBarHeight(context)
-        window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, height)
-        window.setGravity(Gravity.CENTER)
-        EventBus.getDefault().register(this)
-        binding.rgPlan.setOnCheckedChangeListener { group, checkedId ->
-            updateCurrGoods(goodsList?.getOrNull(group.indexOfChild(group.findViewById(checkedId))))
-        }
-
-        binding.tvCharge.setOnClickListener {
-            currGoods?.let {
-                SelectPayTypeDialog.newInstance(it.chargeProdId, "¥${it.chargeMoney}")
-                    .show(this)
-                StatisticManager.Instance()
-                    .onEvent(
-                        StatisticsProtocol.EVENT_NUGIFT_POP_CLICK,
-                        ResUtil.getString(R.string.avroom_newuserchargegift_newuserchargegiftdialog_01),
-                        mapOf("charge_money" to "${it.chargeMoney}元")
-                    )
-            } ?: run {
-                "請選擇充值產品!".toast()
-            }
-        }
-
-        rvDelegate = RVDelegate.Builder<FirstChargeReward>()
-            .setAdapter(RewardAdapter().also { rewardAdapter = it })
-            .setLayoutManager(LinearLayoutManager(this, RecyclerView.HORIZONTAL, false))
-            .setRecyclerView(binding.recyclerView)
-            .build()
-
-        dialogManager.showProgressDialog(this)
-        PayModel.get().newUserChargeInfo
-            .compose(bindToLifecycle())
-            .subscribe({
-                it.limitFirstChargeTaskList?.let { it1 -> initData(it1) }
-                initNewUserCharge(it.limitEndTime)
-                dialogManager.dismissDialog()
-            }, {
-                it.printStackTrace()
-                dialogManager.dismissDialog()
-                SingleToastUtil.showToast(it.message)
-                finish()
-            })
-
-        binding.viewBg.setOnClickListener {
-            //do nothing
-        }
-        val closeClick = View.OnClickListener {
-            finish()
-            StatisticManager.Instance()
-                .onEvent(StatisticsProtocol.EVENT_NUGIFT_POP_CLOSE_CLICK, "新人專享禮物彈窗關閉點擊")
-        }
-        binding.root.setOnClickListener(closeClick)
-        binding.ivClose.setOnClickListener(closeClick)
-    }
-
-    @SuppressLint("SetTextI18n")
-    private fun initData(goodsList: List<FirstChargeGoods>) {
-        this.goodsList = goodsList
-        updateCurrGoods(goodsList.getOrNull(0))
-        val planViews = arrayListOf(
-            binding.rbPlanA,
-            binding.rbPlanB,
-            binding.rbPlanC,
-            binding.rbPlanD
-        )
-        var initChecked = false
-        planViews.forEachIndexed { index, button ->
-            goodsList.getOrNull(index)?.let {
-                if (!it.finishCharge && !initChecked) {
-                    initChecked = true
-                    button.isChecked = true
-                }
-                button.isVisible = true
-                button.text = "${it.chargeMoney}元"
-            } ?: run {
-                button.isVisible = false
-            }
-        }
-    }
-
-    @SuppressLint("CheckResult", "SetTextI18n")
-    private fun initNewUserCharge(limitChargeEndTime: Long) {
-        val count = (limitChargeEndTime - CurrentTimeUtils.getCurrentTime()) / 1000 / 60 + 1
-        if (count <= 0) return
-        Observable.intervalRange(0, count, 0, 1, TimeUnit.MINUTES)
-            .compose(bindUntilEvent(ActivityEvent.DESTROY))
-            .observeOn(AndroidSchedulers.mainThread())
-            .doOnComplete {
-                finish()
-            }
-            .subscribe({
-                val residueTime =
-                    limitChargeEndTime - CurrentTimeUtils.getCurrentTime()
-                if (residueTime <= 0) {
-                    UserModel.get().cacheLoginUserInfo?.isShowLimitCharge = false
-                    finish()
-                } else {
-                    binding.tvTime.text =
-                        "限時${TimeUtil.getElapseTimeForNewUserCharge(residueTime)}"
-                }
-            }, {
-                it.printStackTrace()
-            })
-    }
-
-    private fun updateCurrGoods(firstChargeGoods: FirstChargeGoods?) {
-        firstChargeGoods?.let {
-            currGoods = it
-            binding.tvTitle.text = it.chargeProdTitle
-            binding.tvCharge.isEnabled = !it.finishCharge
-            rewardAdapter.setNewData(it.firstChargeRewardList)
-        }
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        dialogManager.dismissDialog()
-        if (resultCode != RESULT_OK) {
-            return
-        }
-        if (requestCode == BIND_CODE_GOLD) {
-            ModifyPwdActivity.start(this, ModifyPwdActivity.FOGERT_PAY_PWD)
-        }
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onNewUserChargeEvent(event: NewUserChargeEvent?) {
-        finish()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        EventBus.getDefault().unregister(this)
-    }
-
-}

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

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<IAvRoomView> {
             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<IAvRoomView> {
         AvRoomModel.get().getFirstCharge()
                 .compose(bindToLifecycle())
                 .subscribe(firstChargeInfo -> {
-                if (getMvpView() != null && firstChargeInfo.getNeedToShow()) {
+                    if (getMvpView() != null && firstChargeInfo.getNeedToShow()) {
                         getMvpView().showFirstChargeDialog(firstChargeInfo);
                     }
                 });

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<IRoomSettingView> {
                 if (mMvpView != null)
                     mMvpView.leaveModeOpenSuccess();
 
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_OPEN_LEAVE_MODE,
-                        ResUtil.getString(R.string.avroom_presenter_roomsettingpresenter_01));
                 updateRoomOwnerMic();
 
             }

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<RecommendCard, BaseV
             holder.setGone(R.id.tv_card_count, true);
             validTimeBuild.append(ResUtil.getString(R.string.avroom_recommendcard_recommendcardlistadapter_04))
                     .append(TimeUtils.getFormatTimeString(item.getValidEndTime(), validEndFormat));
-            stv_card_op.setOnClickListener(v ->{
-                    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);

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<DialogRedPackageSendBinding>(), GridPass
                     CommonWebViewActivity.start(
                         context, UriProvider.getOfficialPay(
                             4,
-                            DeviceConfig.getDeviceId(context)
+                            DeviceUtil.getDeviceId(context)
                         )
                     )
                 }
@@ -237,8 +235,6 @@ class RedPackageSendDialog : BaseDialog<DialogRedPackageSendBinding>(), GridPass
                     SingleToastUtil.showToast("發送成功")
                     passWordFragment?.dismissAllowingStateLoss()
                     dismissAllowingStateLoss()
-                    StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_SENDHONGBAO_SUCCESS,
-                        "發紅包成功")
                 }
         }
     }

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;

app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java

@@ -146,12 +146,9 @@ 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.user.UserModel;
 import com.yizhuan.xchat_android_core.user.bean.UserInfo;
 import com.yizhuan.xchat_android_core.utils.ExtensionUtil;
-import com.yizhuan.xchat_android_core.utils.Logger;
 import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
 import com.yizhuan.xchat_android_core.utils.net.RxHelper;
 import com.yizhuan.xchat_android_core.vip.VipMessageInfo;
@@ -1363,7 +1360,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);
                                     }
                                 }
@@ -2565,7 +2561,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());
@@ -2716,9 +2711,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)

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

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<ActivityBillsGiftBi
                     CommonWebViewActivity.start(
                             mActivity, UriProvider.getOfficialPay(
                                     4,
-                                    DeviceConfig.getDeviceId(mActivity)
+                                    DeviceUtil.getDeviceId(mActivity)
                             )
                     );
                 }

app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftInComeActivity.java

@@ -8,7 +8,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.umeng.commonsdk.statistics.common.DeviceConfig;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.TitleBar;
 import com.yizhuan.erban.bills.adapter.GiftIncomeAdapter;
@@ -25,6 +24,7 @@ import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo;
 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;
@@ -202,7 +202,7 @@ public class BillGiftInComeActivity extends BillBaseActivity<ActivityBillsGiftBi
                     CommonWebViewActivity.start(
                             mActivity, UriProvider.getOfficialPay(
                                     4,
-                                    DeviceConfig.getDeviceId(mActivity)
+                                    DeviceUtil.getDeviceId(mActivity)
                             )
                     );
                 }

app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java

@@ -13,7 +13,6 @@ import android.widget.TextView;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
-import com.umeng.commonsdk.statistics.common.DeviceConfig;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter;
 import com.yizhuan.erban.base.BaseMvpActivity;
@@ -33,6 +32,7 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.Commo
 import com.yizhuan.xchat_android_core.Constants;
 import com.yizhuan.xchat_android_core.UriProvider;
 import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
+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;
 
@@ -131,7 +131,7 @@ public class BillGiftIncomeGroupActivity extends BaseMvpActivity<IBillGiftIncome
                         CommonWebViewActivity.start(
                                 context, UriProvider.getOfficialPay(
                                         4,
-                                        DeviceConfig.getDeviceId(context)
+                                        DeviceUtil.getDeviceId(context)
                                 )
                         );
                     }

app/src/main/java/com/yizhuan/erban/bills/activities/ChargeBillsActivity.java

@@ -8,7 +8,6 @@ import android.view.View;
 import android.widget.ImageView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.umeng.commonsdk.statistics.common.DeviceConfig;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.base.TitleBar;
 import com.yizhuan.erban.bills.adapter.ChargeBillsAdapter;
@@ -24,6 +23,7 @@ import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity;
 import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo;
 import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo;
 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;
@@ -185,7 +185,7 @@ public class ChargeBillsActivity extends BillBaseActivity<ActivityBillsBinding>
                     CommonWebViewActivity.start(
                             mActivity, UriProvider.getOfficialPay(
                                     4,
-                                    DeviceConfig.getDeviceId(mActivity)
+                                    DeviceUtil.getDeviceId(mActivity)
                             )
                     );
                 }

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<ActivityBillsBinding>
                     CommonWebViewActivity.start(
                             context, UriProvider.getOfficialPay(
                                     4,
-                                    DeviceConfig.getDeviceId(context)
+                                    DeviceUtil.getDeviceId(context)
                             )
                     );
                 }

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<ActivityWithdrawB
                     CommonWebViewActivity.start(
                             context, UriProvider.getOfficialPay(
                                     4,
-                                    DeviceConfig.getDeviceId(context)
+                                    DeviceUtil.getDeviceId(context)
                             )
                     );
                 }

app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java

@@ -2,7 +2,6 @@ package com.yizhuan.erban.common.widget.dialog;
 
 import android.content.Context;
 
-import com.umeng.commonsdk.statistics.common.DeviceConfig;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.application.IReportConstants;
 import com.yizhuan.erban.application.ReportManager;
@@ -13,9 +12,8 @@ import com.yizhuan.xchat_android_core.Constants;
 import com.yizhuan.xchat_android_core.UriProvider;
 import com.yizhuan.xchat_android_core.pay.PayModel;
 import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
-import com.yizhuan.xchat_android_core.statistic.StatisticManager;
-import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
 import com.yizhuan.xchat_android_core.utils.ActivityUtil;
+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;
 
@@ -72,7 +70,7 @@ public class DialogUiHelper {
                         CommonWebViewActivity.start(
                                 context, UriProvider.getOfficialPay(
                                         4,
-                                        DeviceConfig.getDeviceId(context)
+                                        DeviceUtil.getDeviceId(context)
                                 )
                         );
                     }

app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoginPopupDialog.java

@@ -1,78 +0,0 @@
-package com.yizhuan.erban.common.widget.dialog;
-
-
-import android.app.Dialog;
-import android.content.Context;
-import android.view.Gravity;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-
-import com.yizhuan.erban.R;
-
-
-public class LoginPopupDialog extends Dialog implements OnClickListener {
-
-	private ViewGroup mContentView;
-	private View mBtnRegister;
-	private View mBtnLogin;
-	private View mQQLogin;
-	private View mSinaLogin;
-	private View mWeChatLogin;
-
-	private OnLoginPopupDialogListener mL;
-	
-	public LoginPopupDialog(Context context, final OnLoginPopupDialogListener l) {
-		super(context, R.style.Dialog_Fullscreen);
-		mL = l;
-		mContentView = (ViewGroup) View.inflate(getContext(), R.layout.layout_login_popup_dialog, null);
-		//mTvTitle = (TextView) mContentView.findViewById(R.id.tv_title);
-		mBtnRegister = mContentView.findViewById(R.id.btn_register);
-		mBtnLogin = mContentView.findViewById(R.id.btn_login);
-//		mQQLogin = mContentView.findViewById(R.id.qq_login);
-//		mSinaLogin = mContentView.findViewById(R.id.sina_login);
-//		mWeChatLogin = mContentView.findViewById(R.id.wechat_login);
-		mBtnRegister.setOnClickListener(this);
-		mBtnLogin.setOnClickListener(this);
-//		mQQLogin.setOnClickListener(this);
-//		mSinaLogin.setOnClickListener(this);
-//		mWeChatLogin.setOnClickListener(this);
-
-		setContentView(mContentView);
-		setCanceledOnTouchOutside(true);
-
-		Window window = getWindow();
-		WindowManager.LayoutParams params = window.getAttributes();
-		params.height = WindowManager.LayoutParams.WRAP_CONTENT;
-		window.setGravity( Gravity.BOTTOM );
-		window.setAttributes(params);
-		window.setWindowAnimations(R.style.DialogAnimation);
-	}
-
-	@Override
-	public void onClick(View arg0) {
-        if(arg0 == mBtnRegister){
-            mL.onClickRegister();
-        } else if(arg0 == mBtnLogin){
-            mL.onClickLogin();
-        } else if (arg0 == mQQLogin) {
-			mL.onClickQQ();
-		} else if (arg0 == mSinaLogin) {
-			mL.onClickWeibo();
-		} else if (arg0 == mWeChatLogin) {
-			mL.onClickWeChat();
-		}
-		dismiss();
-	}
-	
-	public interface OnLoginPopupDialogListener{
-		void onClickRegister();
-		void onClickLogin();
-		void onClickWeibo();
-		void onClickQQ();
-		void onClickWeChat();
-        void dismissDialog();
-	}
-}

app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java

@@ -91,9 +91,9 @@ public class MyCarAdapter extends BaseAdapter<CarInfo> {
         } else {
             tvUsed.setVisibility(View.VISIBLE);
             tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_04));
-            tvUsed.setBackgroundResource(R.drawable.bg_common_confirm_30);
+            tvUsed.setBackgroundResource(R.drawable.selector_common_confirm);
             tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_button_color_first));
-            tvUsed.setEnabled(false);
+            tvUsed.setEnabled(true);
         }
 
     }

app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt

@@ -8,7 +8,6 @@ import androidx.activity.viewModels
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentPagerAdapter
 import com.netease.nim.uikit.StatusBarUtil
-import com.umeng.commonsdk.statistics.common.DeviceConfig
 import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseViewBindingActivity
 import com.yizhuan.erban.base.TitleBar
@@ -27,6 +26,7 @@ import com.yizhuan.xchat_android_core.home.bean.TabInfo
 import com.yizhuan.xchat_android_core.pay.PayModel
 import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent
 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.FormatUtils
 import com.yizhuan.xchat_android_library.utils.ResUtil
@@ -80,7 +80,7 @@ class DecorationStoreActivity : BaseViewBindingActivity<ActivityDecorationStoreB
                 CommonWebViewActivity.start(
                     this, UriProvider.getOfficialPay(
                         4,
-                        DeviceConfig.getDeviceId(this)
+                        DeviceUtil.getDeviceId(this)
                     )
                 )
             }

app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt

@@ -6,7 +6,6 @@ import android.view.View
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
 import com.netease.nim.uikit.StatusBarUtil
-import com.umeng.commonsdk.statistics.common.DeviceConfig
 import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseViewBindingActivity
 import com.yizhuan.erban.databinding.ActivityEarnRecordBinding
@@ -15,6 +14,7 @@ import com.yizhuan.erban.ui.pay.ChargeActivity
 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.common.util.DeviceUtil
 import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil
 
 /**
@@ -101,7 +101,7 @@ class EarnRecordActivity : BaseViewBindingActivity<ActivityEarnRecordBinding>(),
                     CommonWebViewActivity.start(
                         context, UriProvider.getOfficialPay(
                             4,
-                            DeviceConfig.getDeviceId(context)
+                            DeviceUtil.getDeviceId(context)
                         )
                     )
                 }

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<IFamilyHomeActivityView,
             //去创建群组
             CreateTeamMessageActivity.start(this);
         } else if (id == rlJoinFamily.getId()) {
-
-            StatisticManager.Instance().onEvent(BasicConfig.INSTANCE.getAppContext(),
-                    StatisticsProtocol.JOIN_FAMILY_CLICK, ResUtil.getString(R.string.view_activity_familyhomeactivity_07), null);
-
             joinFamily(getMvpPresenter().getFamilyInfo());
         }
     }

app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyPlazaActivity.java

@@ -21,13 +21,9 @@ 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.response.RankingFamilyInfo;
 import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList;
-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;
 import com.yizhuan.xchat_android_library.utils.SizeUtils;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
 
 import io.reactivex.SingleObserver;
 import io.reactivex.disposables.Disposable;
@@ -46,10 +42,6 @@ public class FamilyPlazaActivity extends BaseMvpActivity<IFamilyPlazaActivityVie
     private boolean isFirstLoad = true;
 
     public static void start(Context context) {
-
-        StatisticManager.Instance().onEvent(BasicConfig.INSTANCE.getAppContext(),
-                StatisticsProtocol.FAMILY_FAMILY_SQUARE_CLICK, ResUtil.getString(R.string.view_activity_familyplazaactivity_01), null);
-
         Intent intent = new Intent(context,FamilyPlazaActivity.class);
         context.startActivity(intent);
     }

app/src/main/java/com/yizhuan/erban/home/HomeViewModel.kt

@@ -2,7 +2,6 @@ package com.yizhuan.erban.home
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.yizhuan.erban.R
 import com.yizhuan.erban.base.BaseViewModel
 import com.yizhuan.xchat_android_core.bean.response.ListResult
 import com.yizhuan.xchat_android_core.home.bean.BannerInfo
@@ -11,10 +10,7 @@ import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo
 import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo
 import com.yizhuan.xchat_android_core.home.model.HomeModel
 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.utils.toast
-import com.yizhuan.xchat_android_library.utils.ResUtil
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 
@@ -101,11 +97,6 @@ class HomeViewModel : BaseViewModel() {
         safeLaunch(
             onError = {
                 it.message.toast()
-                StatisticManager.Instance()
-                    .onEvent(
-                        StatisticsProtocol.EVENT_USERCENTER_QUICK_ENTRYSUCCESS_CLICK,
-                        ResUtil.getString(R.string.erban_home_homeviewmodel_01)
-                    )
             },
             block = {
                 val homeRoomInfo = HomeModel.fastPickGameRoom(mgId)

app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java

@@ -3,7 +3,6 @@ package com.yizhuan.erban.home.activity;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.view.View;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -18,8 +17,6 @@ import com.yizhuan.erban.home.adapter.CollectionRoomAdapter;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
 import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo;
 import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel;
-import com.yizhuan.xchat_android_core.statistic.StatisticManager;
-import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
 import com.yizhuan.xchat_android_library.utils.ListUtils;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 
@@ -55,7 +52,6 @@ public class CollectionRoomActivity extends BaseViewBindingActivity<ActivityColl
         roomAdapter.setOnItemChildClickListener((adapter, view, position) -> {
             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());
             }
         });

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<HomeRoomInfo, BaseViewHolder> {
 
@@ -45,8 +42,6 @@ public class HomeConcernsAdapter extends BaseQuickAdapter<HomeRoomInfo, BaseView
                         AVRoomActivity.FROM_TYPE_USER,
                         item.getNick(),
                         String.valueOf(item.getUid()));
-                StatisticManager.Instance()
-                        .onEvent(StatisticsProtocol.EVENT_GZR_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_homeconcernsadapter_01));
             });
         } else {
             helper.setVisible(R.id.view_avatar_bg, false);

app/src/main/java/com/yizhuan/erban/home/adapter/HomeLiveTopAdapter.kt

@@ -7,9 +7,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.room.bean.HomeLiveTopInfo
-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
 
 
 class HomeLiveTopAdapter :
@@ -30,11 +27,6 @@ class HomeLiveTopAdapter :
 
         helper.itemView.setOnClickListener {
             AVRoomActivity.start(mContext, item.uid)
-            StatisticManager.Instance().onEvent(
-                StatisticsProtocol.EVENT_RECENT_CARD_CLICK,
-                ResUtil.getString(R.string.home_adapter_homelivetopadapter_01),
-                mapOf("room_id" to item.erbanNo)
-            )
         }
 
     }

app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java

@@ -14,9 +14,6 @@ import com.yizhuan.erban.R;
 import com.yizhuan.erban.avroom.activity.AVRoomActivity;
 import com.yizhuan.erban.ui.utils.ImageLoadUtils;
 import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
-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;
 
 /**
  * <p> 首页热门adapter </p>
@@ -46,7 +43,6 @@ public class HomeRoomFragmentAdapter extends BaseMultiItemQuickAdapter<HomeTabMa
 
             case HomeTabMapInfo.TYPE_NORMAL:
                 helper.itemView.setOnClickListener(v -> {
-                    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() + "")

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,

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<HomeTabMapInfo> {
         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);

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

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

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;
@@ -17,9 +16,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;
@@ -62,11 +58,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());
@@ -74,15 +66,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;

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<HomeRoomInfo, BaseViewHolder>(R.layout.
             getView<ImageView>(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<TextView>(R.id.tv_room_game)

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<HomeRoomInfo, BaseViewHolder>(null) {
@@ -28,8 +25,6 @@ class RoomHotAdapter : BaseMultiItemQuickAdapter<HomeRoomInfo, BaseViewHolder>(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<ImageView>(R.id.iv_room_image).load(item.avatar)

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<HomeRoomInfo, BaseViewHolder>(R.layout.item_room_like) {
@@ -43,8 +40,6 @@ class RoomLikeAdapter : BaseQuickAdapter<HomeRoomInfo, BaseViewHolder>(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)

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 -> {

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() {

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<ActivityLuck
                                                 CommonWebViewActivity.start(
                                                         context, UriProvider.getOfficialPay(
                                                                 4,
-                                                                DeviceConfig.getDeviceId(context)
+                                                                DeviceUtil.getDeviceId(context)
                                                         )
                                                 );
                                             }

app/src/main/java/com/yizhuan/erban/main/helper/NoticationsUiHelper.java

@@ -5,8 +5,6 @@ import android.app.Activity;
 import com.yizhuan.erban.R;
 import com.yizhuan.erban.common.widget.dialog.DialogManager;
 import com.yizhuan.erban.utils.NotificationsUtils;
-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_core.utils.net.RxHelper;
@@ -87,14 +85,11 @@ public class NoticationsUiHelper {
 
                                     @Override
                                     public void onCancel() {
-                                        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_HOME_PUSH_INQUIRE,
-                                                ResUtil.getString(R.string.main_helper_noticationsuihelper_05));
+
                                     }
 
                                     @Override
                                     public void onOk() {
-                                        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_HOME_PUSH_INQUIRE,
-                                                ResUtil.getString(R.string.main_helper_noticationsuihelper_06));
                                         NotificationsUtils.openPush(activity);
                                     }
                                 });

app/src/main/java/com/yizhuan/erban/other/activity/SplashActivity.java

@@ -14,7 +14,6 @@ import androidx.databinding.DataBindingUtil;
 import com.bumptech.glide.request.RequestOptions;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.umeng.commonsdk.UMConfigure;
 import com.yizhuan.erban.MainActivity;
 import com.yizhuan.erban.NimMiddleActivity;
 import com.yizhuan.erban.R;
@@ -30,6 +29,7 @@ import com.yizhuan.xchat_android_core.initial.InitialModel;
 import com.yizhuan.xchat_android_core.initial.SplashComponent;
 import com.yizhuan.xchat_android_core.utils.OaidUtil;
 import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
+import com.yizhuan.xchat_android_library.common.util.DeviceUtil;
 
 /**
  * @author xiaoyu
@@ -103,10 +103,10 @@ public class SplashActivity extends AppCompatActivity implements View.OnClickLis
 
     private void showSplash(boolean first) {
 
-        UMConfigure.getOaid(this, oaid -> {
-            OaidUtil.setOaid(oaid);
+        if(!TextUtils.isEmpty(DeviceUtil.getAndroidID())){
+            OaidUtil.setOaid(DeviceUtil.getAndroidID());
             if (first) ChannelPageModel.get().checkAd();
-        });
+        }
 
         mBinding.tvSkip.setVisibility(View.VISIBLE);
         // 不过期的，并且已经下载出来图片的闪屏页数据

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<IRadishRecordView, Rad
     private TextView tvTotalRadish;
 
     public static void startActivity(Context context) {
-        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MY_RADISH_CLICK, ResUtil.getString(R.string.radish_activity_radishrecordactivity_01));
         Intent intent = new Intent(context, RadishRecordActivity.class);
         context.startActivity(intent);
     }

app/src/main/java/com/yizhuan/erban/radish/helper/PrizeAnimUiHelper.java

@@ -18,8 +18,6 @@ import com.yizhuan.erban.ui.widget.ShareDialog;
 import com.yizhuan.xchat_android_core.radish.signin.SignInModel;
 import com.yizhuan.xchat_android_core.radish.task.bean.PrizeAnim;
 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.utils.net.BeanObserver;
 import com.yizhuan.xchat_android_core.utils.net.RxHelper;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
@@ -117,12 +115,6 @@ public class PrizeAnimUiHelper {
 
                     @Override
                     public void onSharePlatformClick(Platform platform) {
-                        if (mType == TYPE_SIGN_IN_PAGE) {
-//                            StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SIGN_SHARE_CLICK, ResUtil.getString(R.string.radish_helper_prizeanimuihelper_02));
-                        } else if (mType == TYPE_REWARD_PAGE) {
-                            StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SIGN_REWARD_SHARE_CLICK, ResUtil.getString(R.string.radish_helper_prizeanimuihelper_03));
-                        }
-
                         toShare(platform, day, reward);
                     }
                 });

app/src/main/java/com/yizhuan/erban/radish/signin/SignInActivity.java

@@ -47,8 +47,6 @@ 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.radish.task.bean.PrizeAnim;
 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.utils.net.BeanObserver;
 import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
 import com.yizhuan.xchat_android_core.utils.net.RadishNotEnoughException;
@@ -299,7 +297,6 @@ public class SignInActivity extends BaseMvpActivity<ISignInView, SignInPresenter
                         drawGold();
 
                     } else if (!mSignDetailInfo.isSign()) {
-                        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SIGN_IN_CLICK, ResUtil.getString(R.string.radish_signin_signinactivity_012));
                         getMvpPresenter().sign(); // 签到
                     }
                 }
@@ -324,8 +321,6 @@ public class SignInActivity extends BaseMvpActivity<ISignInView, SignInPresenter
 
     @Override
     public void signSuccess(long count) {
-        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SIGN_SUCCESS,
-                ResUtil.getString(R.string.radish_signin_signinactivity_013));
         if (count > 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<ISignInView, SignInPresenter
 
     @Override
     public void onStateSwitched(boolean isOn) {
-        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SIGN_REMIND_SWITCH, ResUtil.getString(R.string.radish_signin_signinactivity_028) + isOn);
         switchSignInNotice.setEnabled(false);
         getMvpPresenter().setRemind();
     }
@@ -682,7 +676,6 @@ public class SignInActivity extends BaseMvpActivity<ISignInView, SignInPresenter
     public void onSharePlatformClick(Platform platform) {
         mSharePlatform = platform;
         showDialog();
-        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SIGN_SHARE_CLICK, ResUtil.getString(R.string.radish_signin_signinactivity_029));
         getMvpPresenter().getShareImage(SignInModel.SHARE_TYPE_NORMAL, null, null);
 
     }

app/src/main/java/com/yizhuan/erban/radish/signin/view/SignInDialog.java

@@ -21,8 +21,6 @@ import com.yizhuan.xchat_android_core.radish.signin.ISignInModel;
 import com.yizhuan.xchat_android_core.radish.signin.SignInModel;
 import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo;
 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.BeanObserver;
 import com.yizhuan.xchat_android_core.utils.net.RxHelper;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
@@ -103,10 +101,6 @@ public class SignInDialog extends AppCompatDialog {
         ivClose.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (!hasClickSignIn) {
-                    StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_POPUP_SIGN_CLOSED,
-                            ResUtil.getString(R.string.signin_view_signindialog_02));
-                }
                 dismiss();
             }
         });
@@ -162,8 +156,6 @@ public class SignInDialog extends AppCompatDialog {
             return;
         }
         hasClickSignIn = true;
-        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_POPUP_SIGN_IN_CLICK,
-                ResUtil.getString(R.string.signin_view_signindialog_03));
         tvSignInOp.setClickable(false);
         model.sign().compose(RxHelper.bindContext(context))
                 .subscribe(new BeanObserver<SignInfo>() {
@@ -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();

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<ITaskCenterView, TaskCen
     PrizeAnimUiHelper priceAnimUiHelper;
 
     public static void start(Context context, String fromPage) {
-        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_FIND_TASK_CLICK,
-                ResUtil.getString(R.string.task_activity_taskcenteractivity_04) + fromPage);
         Intent intent = new Intent(context, TaskCenterActivity.class);
         context.startActivity(intent);
     }

app/src/main/java/com/yizhuan/erban/radish/task/fragment/TaskCenterFragment.java

@@ -24,12 +24,9 @@ import com.yizhuan.xchat_android_constants.XChatConstants;
 import com.yizhuan.xchat_android_core.radish.task.ITaskModel;
 import com.yizhuan.xchat_android_core.radish.task.TaskModel;
 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.net.DontWarnObserver;
 import com.yizhuan.xchat_android_core.utils.net.RxHelper;
 import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 
 @CreatePresenter(TaskCenterFrgPresenter.class)
@@ -94,16 +91,6 @@ public class TaskCenterFragment extends BaseMvpFragment<ITaskCenterViewFrg, Task
                 if (item.getStatus() == TaskInfo.STATUS_FINISHED_NOT_RECEIVE) {
                     view.setClickable(false);
 
-                    if (mType == TYPE_TASK) {
-                        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_TASK_GET_CLICK,
-                                ResUtil.getString(R.string.task_fragment_taskcenterfragment_01) + item.getName());
-
-                    } else if (mType == TYPE_ACHIEVEMENT) {
-                        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_CJTASK_GET_CLICK,
-                                ResUtil.getString(R.string.task_fragment_taskcenterfragment_02) + item.getName());
-
-                    }
-
                     new TaskModel().receivePrice(item.getConfigId(), item.getPrizeType())
                             .compose(RxHelper.bindContext(mContext))
                             .subscribe(new DontWarnObserver<String>() {
@@ -143,15 +130,6 @@ public class TaskCenterFragment extends BaseMvpFragment<ITaskCenterViewFrg, Task
                         SingleToastUtil.showToast(XChatConstants.UPDATE_VERSION_TIPS);
 
                     if (record) {
-                        if (mType == TYPE_TASK) {
-                            StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_TASK_TOFINSH_CLICK,
-                                    ResUtil.getString(R.string.task_fragment_taskcenterfragment_03) + item.getName());
-
-                        } else if (mType == TYPE_ACHIEVEMENT) {
-                            StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_CJTASK_TOFINSH_CLICK,
-                                    ResUtil.getString(R.string.task_fragment_taskcenterfragment_04) + item.getName());
-
-                        }
 
                     }
                 }

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:

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;
 

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

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

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

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<Void>() {
             @Override
             public void onSuccess(Void param) {
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_PRIVATECHAT_CAHT,
-                        ResUtil.getString(R.string.im_fragment_messagefragment_01));
+
             }
 
             @Override

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

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<AttentionInfo> iterator = attentionInfos.iterator();

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<ActivityLoginCodeBinding>() {
                     dealWithLoginError(e)
                 }
             })
-        StatisticManager.Instance().onEvent(
-            this,
-            StatisticsProtocol.EVENT_LOGIN_PHONE_CLICK,
-            ResUtil.getString(R.string.ui_login_logincodeactivity_03),
-            null
-        )
     }
 
     /**

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;
@@ -45,7 +40,7 @@ import me.shihao.library.XRadioGroup;
 
 /**
  * @author jack
- * @Description
+ * @Description 新用戶注冊
  * @Date 2018/11/23
  */
 public class AddUserInfoFragment extends BaseFragment
@@ -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<String, Object> map = new HashMap<>(2);
                         map.put(FirebaseAnalytics.Param.METHOD, finalChannel);
@@ -236,14 +228,6 @@ public class AddUserInfoFragment extends BaseFragment
                         toast(e.getMessage());
                     }
                 });
-
-        Map<String, String> 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

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;

app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java

@@ -38,7 +38,7 @@ public class BillingManager implements PurchasesUpdatedListener {
     private static final String TAG = "BillingManager";
 
     /*购买key*/
-    private static final String BASE_64_ENCODED_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs1/xs5aYKXp5iWlhuM763hAaNt3GneWBf2I4DjM2vTf43UWs1wgAnTpMIgoI80epnVPvdqbInu9fPMU7dp8d2XmjOF0GKydvnwUN0BpWKtg0kAcMCd7TW2s+FoZRmii2RkX2VGYMxLsCaN4P++DcpXQ8v8UyfvMNcLiVBeERM8+/FYfB94cA6OEoILb1bYwn4pGb7UlY7h11Zu0Hzmp2g209rfAmVRtO4SnEbvTicQI2l3mC6ggZi3pz5ffZxkWY7D3Y+NPgNogL/ZVZd8S8tt7lwpnmuF9s3fKcj3c6zun+B599YYxDVmZR688f5a43jc81/BHQwWKuMVCyCIPIFwIDAQAB";
+    private static final String BASE_64_ENCODED_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAotfZw5IAGCV4V/L/AblIO5DL/hrLTwC9MDlVoEEcL8rgrF4GIZrzhInQhqwjoY8FelThezK68ccMz4i+hi3Mup9kHNhYjlZo+A14gXV+omEzAFiWtqOsISvifSxrMi849LQuXfImqlKNRLzp+YSkr4oJq7OE7QmxlLwpAzFj623c6Z9NSj+NdoE3bRrS2F1SSGYYyHEMyV005TdzKnqtjwtkga2RPNZCnyepU6OuF/HrIUoBTIVpgd4aZC2lKSBY9GNBMxZLd0yCsXNLXRXnR0itaNh0clYkxUSa3PemqjBsr79hLFn2yQKDsBwSCBAfBsgbpAA84PF5Jl4dw6rl0wIDAQAB";
 
     /*客户端*/
     private BillingClient billingClient;

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<ISearchView, SearchPresenter
         mSearchHistoryAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
             @Override
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SEARCH_RECENT_SEARCH, ResUtil.getString(R.string.ui_search_searchactivity_01));
-
                 List<String> list = adapter.getData();
                 if (position >= 0 && position < list.size()) {
                     String record = list.get(position);
@@ -320,7 +316,6 @@ public class SearchActivity extends BaseMvpActivity<ISearchView, SearchPresenter
 
                     toSearch();
                 }
-
             }
         });
         rvSearchHistory.setAdapter(mSearchHistoryAdapter);
@@ -349,8 +344,6 @@ public class SearchActivity extends BaseMvpActivity<ISearchView, SearchPresenter
         mRoomHistoryAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
             @Override
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SEARCH_RECENT_ENTER_ROOM, ResUtil.getString(R.string.ui_search_searchactivity_02));
-
                 List<RoomHistoryInfo> list = adapter.getData();
                 if (position >= 0 && position < list.size()) {
                     ImeUtil.hideIME(SearchActivity.this, tvSearch);
@@ -360,7 +353,6 @@ public class SearchActivity extends BaseMvpActivity<ISearchView, SearchPresenter
                         list.add(0, record);
                         mRoomHistoryAdapter.setNewData(list);
                     }
-                    StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SEARCH_INTO_HISTORY_ROOM_CLICK, ResUtil.getString(R.string.ui_search_searchactivity_03));
                     AVRoomActivity.start(SearchActivity.this, record.getRoomUid());
                 }
             }

app/src/main/java/com/yizhuan/erban/ui/search/SearchAdapter.java

@@ -18,8 +18,6 @@ import com.yizhuan.erban.ui.user.activity.UserInfoActivity;
 import com.yizhuan.erban.ui.widget.NobleAvatarView;
 import com.yizhuan.erban.utils.RegexUtil;
 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.user.UserModel;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 
@@ -60,7 +58,6 @@ public class SearchAdapter extends BaseQuickAdapter<SearchRoomInfo, SearchAdapte
             holder.tvOnlineNum.setVisibility(View.VISIBLE);
             holder.tvOnlineNum.setText(item.getOnlineNum() + "");
             holder.container.setOnClickListener(v -> {
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SEARCH_INTO_RESULT_ROOM_CLICK, ResUtil.getString(R.string.ui_search_searchadapter_01));
                 AVRoomActivity.start(mContext, item.getUid());
             });
         }

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<ActivityNotic
     private boolean notifyAttention = false;
 
     public static void start(Context context) {
-        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SETTING_NOTICE,
-                ResUtil.getString(R.string.ui_setting_noticesettingactivity_01));
         Intent intent = new Intent(context, NoticeSettingActivity.class);
         context.startActivity(intent);
     }
@@ -74,8 +70,6 @@ public class NoticeSettingActivity extends BaseViewBindingActivity<ActivityNotic
         switchSystemNotice.setOnSwitchStateChangeListener(new IOSSwitchView.OnSwitchStateChangeListener() {
             @Override
             public void onStateSwitched(boolean isOn) {
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SETTING_SYSTEM_NOTICE,
-                        ResUtil.getString(R.string.ui_setting_noticesettingactivity_05) + isOn);
                 SettingsModel.get().setSysMsgNotify(isOn)
                         .compose(bindUntilEvent(ActivityEvent.DESTROY))
                         .subscribe(new DontWarnObserver<String>() {

app/src/main/java/com/yizhuan/erban/ui/setting/PrivacySettingActivity.java

@@ -16,12 +16,9 @@ import com.yizhuan.erban.base.BaseViewBindingActivity;
 import com.yizhuan.erban.databinding.ActivityPrivacySettingBinding;
 import com.yizhuan.xchat_android_core.auth.AuthModel;
 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.user.UserModel;
 import com.yizhuan.xchat_android_core.user.bean.UserInfo;
 import com.yizhuan.xchat_android_core.utils.net.RxHelper;
-import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.widget.IOSSwitchView;
 
 import java.util.concurrent.CancellationException;
@@ -42,8 +39,6 @@ public class PrivacySettingActivity extends BaseViewBindingActivity<ActivityPriv
     private Disposable matchDisposable;
 
     public static void start(Context context) {
-        StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SETTING_SECRET,
-                ResUtil.getString(R.string.ui_setting_privacysettingactivity_01));
         Intent intent = new Intent(context, PrivacySettingActivity.class);
         context.startActivity(intent);
     }
@@ -62,11 +57,9 @@ public class PrivacySettingActivity extends BaseViewBindingActivity<ActivityPriv
             finish();
             return;
         }
-        boolean isShowLocation = true;
         boolean isShowAge = true;
         boolean isMatchChat = true;
         if (userInfo.getUserExpand() != null) {
-            isShowLocation = userInfo.getUserExpand().isShowLocation();
             isShowAge = userInfo.getUserExpand().isShowAge();
             isMatchChat = userInfo.getUserExpand().isMatchChat();
         }
@@ -76,80 +69,9 @@ public class PrivacySettingActivity extends BaseViewBindingActivity<ActivityPriv
         if (matchDisposable == null || matchDisposable.isDisposed()) {
             binding.switchMatchChat.setOn(isMatchChat);
         }
-
-        if (isShowLocation) {
-            if (ActivityCompat.checkSelfPermission(context,
-                    Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
-                    &&
-                    ActivityCompat.checkSelfPermission(context,
-                            Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED
-            ) {
-                binding.switchLocation.setOn(true);
-
-            } else {
-                //noinspection ResultOfMethodCallIgnored
-                SettingsModel.get().showLocation(AuthModel.get().getCurrentUid(), false)
-                        .compose(bindUntilEvent(ActivityEvent.DESTROY))
-                        .compose(RxHelper.singleMainResult())
-                        .compose(RxHelper.handleSchAndExce())
-                        .subscribe((s, throwable) -> binding.switchLocation.setOn(throwable != null));
-
-            }
-
-        } else if (locationDisposable == null || locationDisposable.isDisposed()) {
-            binding.switchLocation.setOn(false);
-        }
     }
 
     private void initListener() {
-        binding.switchLocation.setOnSwitchStateChangeListener(new IOSSwitchView.OnSwitchStateChangeListener() {
-            @Override
-            public void onStateSwitched(boolean isOn) {
-                long uid = AuthModel.get().getCurrentUid();
-                //如果上一次正在请求，关闭上次请求
-                if (locationDisposable != null && !locationDisposable.isDisposed()) {
-                    locationDisposable.dispose();
-                }
-                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SETTING_LOCATION,
-                        ResUtil.getString(R.string.ui_setting_privacysettingactivity_02) + isOn);
-                locationDisposable = Single.just(isOn)
-                        //检查权限
-                        .flatMap((Function<Boolean, SingleSource<Boolean>>) aBoolean -> {
-                            //判断是否开启权限，只有只有打开地理位置才判断，如果是关闭的时候，不需要判断
-                            if (aBoolean) {
-                                return checkPermission(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION).compose(bindUntilEvent(ActivityEvent.DESTROY)).singleOrError();
-                            } else {
-                                return Single.just(true);
-                            }
-                        })
-                        //判断是否有权限去做
-                        .flatMap((Function<Boolean, SingleSource<String>>) b -> {
-                            if (b) {
-                                return SettingsModel.get().showLocation(uid, isOn)
-                                        .compose(bindUntilEvent(ActivityEvent.DESTROY))
-                                        .compose(RxHelper.singleMainResult())
-                                        .compose(RxHelper.handleSchAndExce());
-                            } else {
-                                throw new SettingActivity.MissingPermissionException(ResUtil.getString(R.string.ui_setting_privacysettingactivity_03));
-                            }
-                        }).subscribe((s, throwable) -> {
-                            //过滤关闭请求
-                            if (throwable instanceof CancellationException) {
-                                return;
-                            }
-                            //缺少权限的时候
-                            else if (throwable instanceof SettingActivity.MissingPermissionException) {
-                                binding.switchLocation.setOn(false);
-                            }
-                            if (throwable != null && !TextUtils.isEmpty(throwable.getMessage())) {
-                                toast(throwable.getMessage());
-                                binding.switchLocation.setOn(!isOn);
-                            }
-                        });
-
-
-            }
-        });
 
         binding.switchAge.setOnSwitchStateChangeListener(new IOSSwitchView.OnSwitchStateChangeListener() {
             @Override
@@ -173,9 +95,6 @@ public class PrivacySettingActivity extends BaseViewBindingActivity<ActivityPriv
                                 binding.switchAge.setOn(!isOn);
                             }
 
-                            StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SETTING_SHOW_AGE,
-                                    isOn ? ResUtil.getString(R.string.ui_setting_privacysettingactivity_04) : ResUtil.getString(R.string.ui_setting_privacysettingactivity_05));
-
                         });
 
 
@@ -205,9 +124,6 @@ public class PrivacySettingActivity extends BaseViewBindingActivity<ActivityPriv
                                     toast(throwable.getMessage());
                                     binding.switchMatchChat.setOn(!isOn);
                                 }
-
-                                StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SETTING_CHAT_MATCHING,
-                                        isOn ? ResUtil.getString(R.string.ui_setting_privacysettingactivity_06) : ResUtil.getString(R.string.ui_setting_privacysettingactivity_07));
                             }
                         });
 

app/src/main/java/com/yizhuan/erban/ui/setting/bean/PermissionEntity.kt

@@ -11,24 +11,6 @@ enum class PermissionEntity(
     var icon: Int = R.drawable.icon_permission_common,
     val permissionName: Array<String>
 ) {
-
-
-    PHONE(
-        ResUtil.getString(R.string.setting_bean_permissionentity_01),
-        ResUtil.getString(R.string.setting_bean_permissionentity_02),
-        R.drawable.icon_permission_phone,
-        arrayOf(Manifest.permission.READ_PHONE_STATE)
-    ),
-    LOCATOIN(
-        ResUtil.getString(R.string.setting_bean_permissionentity_03),
-        ResUtil.getString(R.string.setting_bean_permissionentity_04),
-        R.drawable.icon_permission_location,
-        arrayOf(
-            Manifest.permission.ACCESS_FINE_LOCATION,
-            Manifest.permission.ACCESS_COARSE_LOCATION
-        )
-
-    ),
     CONTACT(
         ResUtil.getString(R.string.setting_bean_permissionentity_05),
         ResUtil.getString(R.string.setting_bean_permissionentity_06),