Merge branch 'master' into master_融云升级

# Conflicts:
#	config.gradle

FaceUnity/build.gradle

@@ -1,12 +1,18 @@
-apply plugin: 'com.android.library'
-apply plugin: 'img-optimizer'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
+//apply plugin: 'com.android.library'
+//apply plugin: 'img-optimizer'
+//apply plugin: 'kotlin-android'
+//apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-parcelize'
+    id 'img-optimizer'
+}
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    namespace "com.yunbao.faceunity"
+    compileSdk rootProject.ext.android.compileSdkVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -33,7 +39,7 @@ android {
         versionName rootProject.ext.android.versionName
         manifestPlaceholders = rootProject.ext.manifestPlaceholders
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
     }
     aaptOptions {
@@ -48,8 +54,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
+    }
+    buildFeatures {
+        buildConfig = true
     }
 }
 repositories {
@@ -58,15 +67,15 @@ repositories {
     }
 }
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-    api rootProject.ext.dependencies["appcompat-androidx"]
-    api rootProject.ext.dependencies["recyclerview-androidx"]
-    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation rootProject.ext.dependencies["appcompat-androidx"]
+    implementation rootProject.ext.dependencies["recyclerview-androidx"]
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     //common
-    api project(path: ':common')
+    implementation project(path: ':common')
 
-    api 'com.faceunity:core:8.7.0'
-    api 'com.faceunity:model:8.7.0'
+    implementation 'com.faceunity:core:8.3.1'
+    implementation 'com.faceunity:model:8.3.1'
     //implementation 'com.faceunity:nama:8.3.1' //底层库-标准版
 
 

FaceUnity/src/androidTest/java/com/yunbao/faceunity/ExampleInstrumentedTest.java

@@ -2,7 +2,7 @@ package com.yunbao.faceunity;
 
 import android.content.Context;
 
-import androidx.test.platform.app.Instrimport com.yunbao.common.utils.MobclickAgent;ntationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;

FaceUnity/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.yunbao.faceunity"
     >
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -11,7 +10,9 @@
 
     <application
         android:icon="@mipmap/ico_home_animoji"
-        android:allowBackup="true">
+        android:allowBackup="true"
+        tools:replace="allowBackup"
+       >
 
     </application>
 

FaceUnity/src/main/java/com/yunbao/faceunity/FaceManager.java

@@ -96,17 +96,11 @@ public class FaceManager implements SensorEventListener {
         faceUnityView.setIFaceUnityInter(new FaceUnityView.IFaceUnityInter() {
             @Override
             public void onPause() {
-                if(onMirrorChanged!=null){
-                    onMirrorChanged.onChange(false);
-                }
                 pauseFace = true;
             }
 
             @Override
             public void onStart() {
-                if(onMirrorChanged!=null){
-                    onMirrorChanged.onChange(true);
-                }
                 pauseFace = false;
             }
         });
@@ -301,18 +295,7 @@ public class FaceManager implements SensorEventListener {
 
     }
 
-    OnMirrorChanged onMirrorChanged;
-
-    public void setOnMirrorChanged(OnMirrorChanged onMirrorChanged) {
-        this.onMirrorChanged = onMirrorChanged;
-    }
-
     public interface FaceStatusChanged {
         void onFaceChanged(int num);
     }
-
-
-    public interface OnMirrorChanged{
-        void onChange(boolean falg);
-    }
 }

FaceUnity/src/main/java/com/yunbao/faceunity/utils/FURenderer.java

@@ -52,10 +52,10 @@ public class FURenderer extends IFURenderer {
 
 
     /* 特效FURenderKit*/
-    public FURenderKit mFURenderKit;
+    private FURenderKit mFURenderKit;
 
     /* AI道具*/
-    public static String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor.bundle";
+    public static String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor_lite.bundle";
     public static  String BUNDLE_AI_HUMAN = "model" + File.separator + "ai_human_processor.bundle";
 
     /* GL 线程 ID */

FaceUnity/src/main/java/com/yunbao/faceunity/utils/FaceUnityConfig.java

@@ -15,7 +15,7 @@ public class FaceUnityConfig {
 
     /************************** 算法Model  ******************************/
     // 人脸识别
-    public static String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor.bundle";
+    public static String BUNDLE_AI_FACE = "model" + File.separator + "ai_face_processor_lite.bundle";
     // 手势
     public static String BUNDLE_AI_HAND = "model" + File.separator + "ai_hand_processor.bundle";
 

IAP6Helper/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    namespace "com.samsung.android.sdk.iap.lib"
+    compileSdk rootProject.ext.android.compileSdkVersion
     defaultConfig {
-        minSdkVersion minSdkVersion
+        minSdkVersion rootProject.ext.android.minSdkVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
-        versionCode versionCode
-        versionName versionName
-        targetSdkVersion targetSdkVersion
+        versionCode rootProject.ext.android.versionCode
+        versionName rootProject.ext.android.versionName
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
     }
 
     buildTypes {
@@ -18,7 +18,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+    buildFeatures {
+        buildConfig = true
+    }
+}
+repositories {
+    flatDir {
+        dirs 'libs', '../libs'
+    }
 }
-
 dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 }

IAP6Helper/src/main/AndroidManifest.xml

@@ -1,30 +1,31 @@
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.samsung.android.sdk.iap.lib"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:versionCode="601000004"
     android:versionName="6.1.0">
     <!-- version code [Major/Minor/Bug fix release/Build number ] : x xx xxx xxx -->
 
-    <application>
+    <application
+        android:allowBackup="true"
+        tools:replace="allowBackup">
         <!-- IAP 라이브러리 내 Activity 선언 시작-->
 
         <activity
-            android:name="com.samsung.android.sdk.iap.lib.activity.DialogActivity"
+            android:name="com.samsung.android.sdk.iap.lib2.activity.DialogActivity"
             android:theme="@style/Theme.Empty"
             android:configChanges="orientation|screenSize"/>
 
         <activity
-            android:name="com.samsung.android.sdk.iap.lib.activity.CheckPackageActivity"
+            android:name="com.samsung.android.sdk.iap.lib2.activity.CheckPackageActivity"
             android:theme="@style/Theme.Empty"
             android:configChanges="orientation|screenSize"/>
 
         <activity
-            android:name="com.samsung.android.sdk.iap.lib.activity.AccountActivity"
+            android:name="com.samsung.android.sdk.iap.lib2.activity.AccountActivity"
             android:theme="@style/Theme.Transparent"
             android:configChanges="orientation|screenSize"/>
 
         <activity
-            android:name="com.samsung.android.sdk.iap.lib.activity.PaymentActivity"
+            android:name="com.samsung.android.sdk.iap.lib2.activity.PaymentActivity"
             android:theme="@style/Theme.Empty"
             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|locale|uiMode|fontScale|density"/>
 

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetOwnedListListener.java

@@ -1,20 +0,0 @@
-package com.samsung.android.sdk.iap.lib.listener;
-
-import com.samsung.android.sdk.iap.lib.helper.task.GetOwnedListTask;
-import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
-import com.samsung.android.sdk.iap.lib.vo.OwnedProductVo;
-
-import java.util.ArrayList;
-
-/**
- * Callback Interface used with {@link GetOwnedListTask}
- */
-public interface OnGetOwnedListListener {
-    /**
-     * Callback method to be invoked when {@link GetOwnedListTask} has been finished.
-     *
-     * @param _errorVO
-     * @param _ownedList
-     */
-    void onGetOwnedProducts(ErrorVo _errorVO, ArrayList<OwnedProductVo> _ownedList);
-}

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetProductsDetailsListener.java

@@ -1,20 +0,0 @@
-package com.samsung.android.sdk.iap.lib.listener;
-
-import com.samsung.android.sdk.iap.lib.helper.task.GetProductsDetailsTask;
-import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
-import com.samsung.android.sdk.iap.lib.vo.ProductVo;
-
-import java.util.ArrayList;
-
-/**
- * Callback Interface used with {@link GetProductsDetailsTask}
- */
-public interface OnGetProductsDetailsListener {
-    /**
-     * Callback method to be invoked when {@link GetProductsDetailsTask} has been finished.
-     *
-     * @param _errorVO
-     * @param _productList
-     */
-    void onGetProducts(ErrorVo _errorVO, ArrayList<ProductVo> _productList);
-}

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/AccountActivity.java

@@ -1,13 +1,13 @@
-package com.samsung.android.sdk.iap.lib.activity;
+package com.samsung.android.sdk.iap.lib2.activity;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.helper.HelperUtil;
-import com.samsung.android.sdk.iap.lib.helper.IapHelper;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.helper.HelperUtil;
+import com.samsung.android.sdk.iap.lib2.helper.IapHelper;
 
 /**
  * Created by sangbum7.kim on 2018-03-06.
@@ -16,12 +16,11 @@ import com.samsung.android.sdk.iap.lib.helper.IapHelper;
 public class AccountActivity extends Activity {
     private static final String TAG = AccountActivity.class.getSimpleName();
 
-    IapHelper mIapHelper = null;
+    com.samsung.android.sdk.iap.lib2.helper.IapHelper mIapHelper = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         mIapHelper = IapHelper.getInstance(this);
         // ====================================================================
         // 1. If IAP package is installed and valid, start SamsungAccount

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/BaseActivity.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.activity;
+package com.samsung.android.sdk.iap.lib2.activity;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -8,25 +8,25 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.dialog.BaseDialogFragment;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.helper.HelperUtil;
-import com.samsung.android.sdk.iap.lib.helper.IapHelper;
-import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
-import com.samsung.android.sdk.iap.lib.vo.PurchaseVo;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.dialog.BaseDialogFragment;
+import com.samsung.android.sdk.iap.lib2.helper.HelperUtil;
+import com.samsung.android.sdk.iap.lib2.helper.IapHelper;
+import com.samsung.android.sdk.iap.lib2.vo.ErrorVo;
+import com.samsung.android.sdk.iap.lib2.vo.PurchaseVo;
 
 
 public abstract class BaseActivity extends Activity {
     private static final String TAG = BaseActivity.class.getSimpleName();
 
-    protected ErrorVo mErrorVo = new ErrorVo();
+    protected com.samsung.android.sdk.iap.lib2.vo.ErrorVo mErrorVo = new com.samsung.android.sdk.iap.lib2.vo.ErrorVo();
     private Dialog mProgressDialog = null;
-    protected PurchaseVo mPurchaseVo = null;
+    protected com.samsung.android.sdk.iap.lib2.vo.PurchaseVo mPurchaseVo = null;
 
     /**
      * Helper Class between IAPService and 3rd Party Application
      */
-    IapHelper mIapHelper = null;
+    com.samsung.android.sdk.iap.lib2.helper.IapHelper mIapHelper = null;
 
     /**
      * Flag value to show successful pop-up. Error pop-up appears whenever it fails or not.
@@ -64,15 +64,15 @@ public abstract class BaseActivity extends Activity {
     public boolean checkAppsPackage(Activity _activity) {
         // 1. If Galaxy Store is installed
         // ====================================================================
-        if (HelperUtil.isInstalledAppsPackage(this)) {
+        if (com.samsung.android.sdk.iap.lib2.helper.HelperUtil.isInstalledAppsPackage(this)) {
             // 1) If Galaxy Store is enabled
             // ================================================================
-            if (!HelperUtil.isEnabledAppsPackage(this)) {
-                HelperUtil.showEnableGalaxyStoreDialog(_activity);
+            if (!com.samsung.android.sdk.iap.lib2.helper.HelperUtil.isEnabledAppsPackage(this)) {
+                com.samsung.android.sdk.iap.lib2.helper.HelperUtil.showEnableGalaxyStoreDialog(_activity);
                 // ================================================================
                 // 2) If Galaxy Store is valid
                 // ================================================================
-            } else if (HelperUtil.isValidAppsPackage(this)) {
+            } else if (com.samsung.android.sdk.iap.lib2.helper.HelperUtil.isValidAppsPackage(this)) {
                 return true;
             } else {
                 // Set error to notify result to third-party application
@@ -84,7 +84,7 @@ public abstract class BaseActivity extends Activity {
                                 R.string.dream_ph_body_contact_p1sscustomer_servicep2ss_for_more_information_n_nerror_code_c_p3ss),
                         "", "", ERROR_ISSUER_IAP_CLIENT + ERROR_CODE_INVALID_GALAXY_STORE);
                 mErrorVo.setError(HelperDefine.IAP_PAYMENT_IS_CANCELED, errorString);
-                HelperUtil.showInvalidGalaxyStoreDialog(this);
+                com.samsung.android.sdk.iap.lib2.helper.HelperUtil.showInvalidGalaxyStoreDialog(this);
             }
             // ================================================================
 
@@ -92,7 +92,7 @@ public abstract class BaseActivity extends Activity {
             // 2. If Galaxy Store is not installed
             // ====================================================================
         } else {
-            HelperUtil.installAppsPackage(this);
+            com.samsung.android.sdk.iap.lib2.helper.HelperUtil.installAppsPackage(this);
         }
         // ====================================================================
         return false;
@@ -161,12 +161,12 @@ public abstract class BaseActivity extends Activity {
             else {
                 Log.e(TAG, "finishPurchase: " + mErrorVo.dump());
                 if (mShowErrorDialog) {
-                    HelperUtil.showIapErrorDialog(
+                    com.samsung.android.sdk.iap.lib2.helper.HelperUtil.showIapErrorDialog(
                             this,
                             getString(R.string.dream_ph_pheader_couldnt_complete_purchase),
                             mErrorVo.getErrorString(),
                             mErrorVo.getErrorDetailsString(),
-                            new BaseDialogFragment.OnClickListener() {
+                            new com.samsung.android.sdk.iap.lib2.dialog.BaseDialogFragment.OnClickListener() {
                                 @Override
                                 public void onClick() {
                                     finish();

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/CheckPackageActivity.java

@@ -1,12 +1,12 @@
-package com.samsung.android.sdk.iap.lib.activity;
+package com.samsung.android.sdk.iap.lib2.activity;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.helper.HelperUtil;
-import com.samsung.android.sdk.iap.lib.helper.IapHelper;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.helper.HelperUtil;
+import com.samsung.android.sdk.iap.lib2.helper.IapHelper;
 
 /**
  * Created by sangbum7.kim on 2018-03-07.
@@ -27,12 +27,12 @@ public class CheckPackageActivity extends Activity {
                 int DialogType = extras.getInt("DialogType");
                 switch (DialogType) {
                     case HelperDefine.DIALOG_TYPE_INVALID_PACKAGE: {
-                        HelperUtil.showInvalidGalaxyStoreDialog(this);
+                        com.samsung.android.sdk.iap.lib2.helper.HelperUtil.showInvalidGalaxyStoreDialog(this);
                         mFinishFlag = false;
                     }
                     break;
                     case HelperDefine.DIALOG_TYPE_DISABLE_APPLICATION: {
-                        HelperUtil.showEnableGalaxyStoreDialog(this);
+                        com.samsung.android.sdk.iap.lib2.helper.HelperUtil.showEnableGalaxyStoreDialog(this);
                         mFinishFlag = false;
                     }
                     break;

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/DialogActivity.java

@@ -1,16 +1,12 @@
-package com.samsung.android.sdk.iap.lib.activity;
+package com.samsung.android.sdk.iap.lib2.activity;
 
 import android.app.Activity;
-import android.content.ActivityNotFoundException;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
-import android.text.TextUtils;
 
-import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.dialog.BaseDialogFragment;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.helper.HelperUtil;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.dialog.BaseDialogFragment;
+import com.samsung.android.sdk.iap.lib2.helper.HelperUtil;
 
 /**
  * Created by sangbum7.kim on 2018-03-05.

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/PaymentActivity.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.activity;
+package com.samsung.android.sdk.iap.lib2.activity;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -9,9 +9,9 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.helper.HelperListenerManager;
-import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.helper.HelperListenerManager;
+import com.samsung.android.sdk.iap.lib2.listener.OnPaymentListener;
 
 public class PaymentActivity extends BaseActivity {
     private static final String TAG = PaymentActivity.class.getSimpleName();
@@ -56,7 +56,7 @@ public class PaymentActivity extends BaseActivity {
         super.preDestory();
         if (isFinishing()) {
             OnPaymentListener onPaymentListener =
-                    HelperListenerManager.getInstance().getOnPaymentListener();
+                    com.samsung.android.sdk.iap.lib2.helper.HelperListenerManager.getInstance().getOnPaymentListener();
             HelperListenerManager.getInstance().setOnPaymentListener(null);
             if (null != onPaymentListener) {
                 onPaymentListener.onPayment(mErrorVo, mPurchaseVo);

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/dialog/BaseDialogFragment.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.dialog;
+package com.samsung.android.sdk.iap.lib2.dialog;
 
 import android.app.ActionBar;
 import android.app.Dialog;
@@ -8,7 +8,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperDefine.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.helper;
+package com.samsung.android.sdk.iap.lib2.helper;
 
 /**
  * Created by sangbum7.kim on 2017-07-17.

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperListenerManager.java

@@ -1,12 +1,12 @@
-package com.samsung.android.sdk.iap.lib.helper;
+package com.samsung.android.sdk.iap.lib2.helper;
 
-import com.samsung.android.sdk.iap.lib.helper.task.ConsumePurchasedItemsTask;
-import com.samsung.android.sdk.iap.lib.helper.task.GetOwnedListTask;
-import com.samsung.android.sdk.iap.lib.helper.task.GetProductsDetailsTask;
-import com.samsung.android.sdk.iap.lib.listener.OnConsumePurchasedItemsListener;
-import com.samsung.android.sdk.iap.lib.listener.OnGetOwnedListListener;
-import com.samsung.android.sdk.iap.lib.listener.OnGetProductsDetailsListener;
-import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener;
+import com.samsung.android.sdk.iap.lib2.listener.OnConsumePurchasedItemsListener;
+import com.samsung.android.sdk.iap.lib2.listener.OnGetOwnedListListener;
+import com.samsung.android.sdk.iap.lib2.listener.OnGetProductsDetailsListener;
+import com.samsung.android.sdk.iap.lib2.listener.OnPaymentListener;
+import com.samsung.android.sdk.iap.lib2.helper.task.ConsumePurchasedItemsTask;
+import com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask;
+import com.samsung.android.sdk.iap.lib2.helper.task.GetProductsDetailsTask;
 
 /**
  * Created by sangbum7.kim on 2017-08-29.

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperUtil.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.helper;
+package com.samsung.android.sdk.iap.lib2.helper;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -14,9 +14,9 @@ import android.text.Html;
 import android.util.Log;
 
 import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.activity.BaseActivity;
-import com.samsung.android.sdk.iap.lib.dialog.BaseDialogFragment;
-import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
+import com.samsung.android.sdk.iap.lib2.activity.BaseActivity;
+import com.samsung.android.sdk.iap.lib2.dialog.BaseDialogFragment;
+import com.samsung.android.sdk.iap.lib2.vo.ErrorVo;
 
 /**
  * Created by sangbum7.kim on 2017-08-17.

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/IapHelper.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.helper;
+package com.samsung.android.sdk.iap.lib2.helper;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -12,20 +12,20 @@ import android.util.Log;
 
 import com.samsung.android.iap.IAPConnector;
 import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.activity.CheckPackageActivity;
-import com.samsung.android.sdk.iap.lib.activity.PaymentActivity;
-import com.samsung.android.sdk.iap.lib.helper.task.ConsumePurchasedItemsTask;
-import com.samsung.android.sdk.iap.lib.helper.task.GetOwnedListTask;
-import com.samsung.android.sdk.iap.lib.helper.task.GetProductsDetailsTask;
-import com.samsung.android.sdk.iap.lib.listener.OnConsumePurchasedItemsListener;
-import com.samsung.android.sdk.iap.lib.listener.OnGetOwnedListListener;
-import com.samsung.android.sdk.iap.lib.listener.OnGetProductsDetailsListener;
-import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener;
-import com.samsung.android.sdk.iap.lib.service.BaseService;
-import com.samsung.android.sdk.iap.lib.service.ConsumePurchasedItems;
-import com.samsung.android.sdk.iap.lib.service.OwnedProduct;
-import com.samsung.android.sdk.iap.lib.service.ProductsDetails;
-import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
+import com.samsung.android.sdk.iap.lib2.activity.CheckPackageActivity;
+import com.samsung.android.sdk.iap.lib2.activity.PaymentActivity;
+import com.samsung.android.sdk.iap.lib2.listener.OnConsumePurchasedItemsListener;
+import com.samsung.android.sdk.iap.lib2.listener.OnGetOwnedListListener;
+import com.samsung.android.sdk.iap.lib2.listener.OnGetProductsDetailsListener;
+import com.samsung.android.sdk.iap.lib2.listener.OnPaymentListener;
+import com.samsung.android.sdk.iap.lib2.service.BaseService;
+import com.samsung.android.sdk.iap.lib2.service.ConsumePurchasedItems;
+import com.samsung.android.sdk.iap.lib2.service.OwnedProduct;
+import com.samsung.android.sdk.iap.lib2.service.ProductsDetails;
+import com.samsung.android.sdk.iap.lib2.vo.ErrorVo;
+import com.samsung.android.sdk.iap.lib2.helper.task.ConsumePurchasedItemsTask;
+import com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask;
+import com.samsung.android.sdk.iap.lib2.helper.task.GetProductsDetailsTask;
 
 import java.util.ArrayList;
 
@@ -46,9 +46,9 @@ public class IapHelper extends HelperDefine {
 
     // AsyncTask for API
     // ========================================================================
-    private GetProductsDetailsTask mGetProductsDetailsTask = null;
-    private GetOwnedListTask mGetOwnedListTask = null;
-    private ConsumePurchasedItemsTask mConsumePurchasedItemsTask = null;
+    private com.samsung.android.sdk.iap.lib2.helper.task.GetProductsDetailsTask mGetProductsDetailsTask = null;
+    private com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask mGetOwnedListTask = null;
+    private com.samsung.android.sdk.iap.lib2.helper.task.ConsumePurchasedItemsTask mConsumePurchasedItemsTask = null;
     // ========================================================================
 
     private ArrayList<BaseService> mServiceQueue = new ArrayList<BaseService>();
@@ -267,7 +267,7 @@ public class IapHelper extends HelperDefine {
             if (mIapConnector == null || mContext == null) {
                 return false;
             } else {
-                mGetProductsDetailsTask = new GetProductsDetailsTask(_baseService,
+                mGetProductsDetailsTask = new com.samsung.android.sdk.iap.lib2.helper.task.GetProductsDetailsTask(_baseService,
                         mIapConnector,
                         mContext,
                         _productIDs,
@@ -344,7 +344,7 @@ public class IapHelper extends HelperDefine {
             if (mIapConnector == null || mContext == null) {
                 return false;
             } else {
-                mGetOwnedListTask = new GetOwnedListTask(_baseService,
+                mGetOwnedListTask = new com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask(_baseService,
                         mIapConnector,
                         mContext,
                         _productType,
@@ -417,7 +417,7 @@ public class IapHelper extends HelperDefine {
                 mConsumePurchasedItemsTask.cancel(true);
             }
 
-            mConsumePurchasedItemsTask = new ConsumePurchasedItemsTask(_baseService,
+            mConsumePurchasedItemsTask = new com.samsung.android.sdk.iap.lib2.helper.task.ConsumePurchasedItemsTask(_baseService,
                     mIapConnector,
                     mContext,
                     _purchaseIds,

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/BaseTask.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.helper.task;
+package com.samsung.android.sdk.iap.lib2.helper.task;
 
 import android.content.Context;
 import android.os.AsyncTask;
@@ -6,9 +6,8 @@ import android.util.Log;
 
 import com.samsung.android.iap.IAPConnector;
 import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.service.BaseService;
-import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
+import com.samsung.android.sdk.iap.lib2.service.BaseService;
+import com.samsung.android.sdk.iap.lib2.vo.ErrorVo;
 
 /**
  * Created by sangbum7.kim on 2017-09-01.

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/ConsumePurchasedItemsTask.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.helper.task;
+package com.samsung.android.sdk.iap.lib2.helper.task;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -6,9 +6,9 @@ import android.util.Log;
 
 import com.samsung.android.iap.IAPConnector;
 import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.service.ConsumePurchasedItems;
-import com.samsung.android.sdk.iap.lib.vo.ConsumeVo;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.service.ConsumePurchasedItems;
+import com.samsung.android.sdk.iap.lib2.vo.ConsumeVo;
 
 import java.util.ArrayList;
 

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetOwnedListTask.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.helper.task;
+package com.samsung.android.sdk.iap.lib2.helper.task;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -6,9 +6,9 @@ import android.util.Log;
 
 import com.samsung.android.iap.IAPConnector;
 import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.service.OwnedProduct;
-import com.samsung.android.sdk.iap.lib.vo.OwnedProductVo;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.service.OwnedProduct;
+import com.samsung.android.sdk.iap.lib2.vo.OwnedProductVo;
 
 import java.util.ArrayList;
 

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetProductsDetailsTask.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.helper.task;
+package com.samsung.android.sdk.iap.lib2.helper.task;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -6,9 +6,9 @@ import android.util.Log;
 
 import com.samsung.android.iap.IAPConnector;
 import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.service.ProductsDetails;
-import com.samsung.android.sdk.iap.lib.vo.ProductVo;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.service.ProductsDetails;
+import com.samsung.android.sdk.iap.lib2.vo.ProductVo;
 
 import java.util.ArrayList;
 

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnConsumePurchasedItemsListener.java

@@ -1,13 +1,13 @@
-package com.samsung.android.sdk.iap.lib.listener;
+package com.samsung.android.sdk.iap.lib2.listener;
 
-import com.samsung.android.sdk.iap.lib.helper.task.GetOwnedListTask;
-import com.samsung.android.sdk.iap.lib.vo.ConsumeVo;
-import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
+import com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask;
+import com.samsung.android.sdk.iap.lib2.vo.ConsumeVo;
+import com.samsung.android.sdk.iap.lib2.vo.ErrorVo;
 
 import java.util.ArrayList;
 
 /**
- * Callback Interface used with {@link GetOwnedListTask}
+ * Callback Interface used with {@link com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask}
  */
 public interface OnConsumePurchasedItemsListener {
     /**

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetOwnedListListener.java

@@ -0,0 +1,20 @@
+package com.samsung.android.sdk.iap.lib2.listener;
+
+import com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask;
+import com.samsung.android.sdk.iap.lib2.vo.ErrorVo;
+import com.samsung.android.sdk.iap.lib2.vo.OwnedProductVo;
+
+import java.util.ArrayList;
+
+/**
+ * Callback Interface used with {@link com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask}
+ */
+public interface OnGetOwnedListListener {
+    /**
+     * Callback method to be invoked when {@link GetOwnedListTask} has been finished.
+     *
+     * @param _errorVO
+     * @param _ownedList
+     */
+    void onGetOwnedProducts(ErrorVo _errorVO, ArrayList<OwnedProductVo> _ownedList);
+}

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetProductsDetailsListener.java

@@ -0,0 +1,20 @@
+package com.samsung.android.sdk.iap.lib2.listener;
+
+import com.samsung.android.sdk.iap.lib2.helper.task.GetProductsDetailsTask;
+import com.samsung.android.sdk.iap.lib2.vo.ErrorVo;
+import com.samsung.android.sdk.iap.lib2.vo.ProductVo;
+
+import java.util.ArrayList;
+
+/**
+ * Callback Interface used with {@link com.samsung.android.sdk.iap.lib2.helper.task.GetProductsDetailsTask}
+ */
+public interface OnGetProductsDetailsListener {
+    /**
+     * Callback method to be invoked when {@link GetProductsDetailsTask} has been finished.
+     *
+     * @param _errorVO
+     * @param _productList
+     */
+    void onGetProducts(ErrorVo _errorVO, ArrayList<ProductVo> _productList);
+}

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnIapBindListener.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.listener;
+package com.samsung.android.sdk.iap.lib2.listener;
 
 /**
  * Callback Interface to be invoked when bind to IAPService has been finished.

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnPaymentListener.java

@@ -1,7 +1,7 @@
-package com.samsung.android.sdk.iap.lib.listener;
+package com.samsung.android.sdk.iap.lib2.listener;
 
-import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
-import com.samsung.android.sdk.iap.lib.vo.PurchaseVo;
+import com.samsung.android.sdk.iap.lib2.vo.ErrorVo;
+import com.samsung.android.sdk.iap.lib2.vo.PurchaseVo;
 
 /**
  * Callback Interface to be invoked when payment has been finished.

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnSucceedBind.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.listener;
+package com.samsung.android.sdk.iap.lib2.listener;
 
 /**
  * Created by sangbum7.kim on 2018-02-28.

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/BaseService.java

@@ -1,15 +1,15 @@
-package com.samsung.android.sdk.iap.lib.service;
+package com.samsung.android.sdk.iap.lib2.service;
 
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
 import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.activity.AccountActivity;
-import com.samsung.android.sdk.iap.lib.activity.DialogActivity;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.helper.IapHelper;
-import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.activity.AccountActivity;
+import com.samsung.android.sdk.iap.lib2.activity.DialogActivity;
+import com.samsung.android.sdk.iap.lib2.helper.IapHelper;
+import com.samsung.android.sdk.iap.lib2.vo.ErrorVo;
 
 /**
  * Created by sangbum7.kim on 2018-02-28.
@@ -18,8 +18,8 @@ import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
 public abstract class BaseService {
     private static final String TAG = BaseService.class.getSimpleName();
 
-    protected ErrorVo mErrorVo = new ErrorVo();
-    protected IapHelper mIapHelper = null;
+    protected com.samsung.android.sdk.iap.lib2.vo.ErrorVo mErrorVo = new com.samsung.android.sdk.iap.lib2.vo.ErrorVo();
+    protected com.samsung.android.sdk.iap.lib2.helper.IapHelper mIapHelper = null;
     protected Context mContext = null;
 
     public BaseService(IapHelper _iapHelper, Context _context) {
@@ -28,7 +28,7 @@ public abstract class BaseService {
         mErrorVo.setError(HelperDefine.IAP_ERROR_INITIALIZATION, mContext.getString(R.string.mids_sapps_pop_unknown_error_occurred));
     }
 
-    public ErrorVo getErrorVo() {
+    public com.samsung.android.sdk.iap.lib2.vo.ErrorVo getErrorVo() {
         return mErrorVo;
     }
 

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ConsumePurchasedItems.java

@@ -1,13 +1,13 @@
-package com.samsung.android.sdk.iap.lib.service;
+package com.samsung.android.sdk.iap.lib2.service;
 
 import android.content.Context;
 import android.util.Log;
 
 import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.helper.IapHelper;
-import com.samsung.android.sdk.iap.lib.listener.OnConsumePurchasedItemsListener;
-import com.samsung.android.sdk.iap.lib.vo.ConsumeVo;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.helper.IapHelper;
+import com.samsung.android.sdk.iap.lib2.listener.OnConsumePurchasedItemsListener;
+import com.samsung.android.sdk.iap.lib2.vo.ConsumeVo;
 
 import java.util.ArrayList;
 
@@ -18,9 +18,9 @@ import java.util.ArrayList;
 public class ConsumePurchasedItems extends BaseService {
     private static final String TAG = ConsumePurchasedItems.class.getSimpleName();
 
-    private OnConsumePurchasedItemsListener mOnConsumePurchasedItemsListener = null;
+    private com.samsung.android.sdk.iap.lib2.listener.OnConsumePurchasedItemsListener mOnConsumePurchasedItemsListener = null;
     private static String mPurchaseIds = "";
-    protected ArrayList<ConsumeVo> mConsumeList = null;
+    protected ArrayList<com.samsung.android.sdk.iap.lib2.vo.ConsumeVo> mConsumeList = null;
 
     public ConsumePurchasedItems(IapHelper _iapHelper, Context _context, OnConsumePurchasedItemsListener _onConsumePurchasedItemsListener) {
         super(_iapHelper, _context);

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/OwnedProduct.java

@@ -1,13 +1,13 @@
-package com.samsung.android.sdk.iap.lib.service;
+package com.samsung.android.sdk.iap.lib2.service;
 
 import android.content.Context;
 import android.util.Log;
 
 import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.helper.IapHelper;
-import com.samsung.android.sdk.iap.lib.listener.OnGetOwnedListListener;
-import com.samsung.android.sdk.iap.lib.vo.OwnedProductVo;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.helper.IapHelper;
+import com.samsung.android.sdk.iap.lib2.listener.OnGetOwnedListListener;
+import com.samsung.android.sdk.iap.lib2.vo.OwnedProductVo;
 
 import java.util.ArrayList;
 
@@ -18,9 +18,9 @@ import java.util.ArrayList;
 public class OwnedProduct extends BaseService {
     private static final String TAG = OwnedProduct.class.getSimpleName();
 
-    private OnGetOwnedListListener mOnGetOwnedListListener = null;
+    private com.samsung.android.sdk.iap.lib2.listener.OnGetOwnedListListener mOnGetOwnedListListener = null;
     private static String mProductType = "";
-    protected ArrayList<OwnedProductVo> mOwnedList = null;
+    protected ArrayList<com.samsung.android.sdk.iap.lib2.vo.OwnedProductVo> mOwnedList = null;
 
     public OwnedProduct(IapHelper _iapHelper, Context _context, OnGetOwnedListListener _onGetOwnedListListener) {
         super(_iapHelper, _context);

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ProductsDetails.java

@@ -1,13 +1,13 @@
-package com.samsung.android.sdk.iap.lib.service;
+package com.samsung.android.sdk.iap.lib2.service;
 
 import android.content.Context;
 import android.util.Log;
 
 import com.samsung.android.sdk.iap.lib.R;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.helper.IapHelper;
-import com.samsung.android.sdk.iap.lib.listener.OnGetProductsDetailsListener;
-import com.samsung.android.sdk.iap.lib.vo.ProductVo;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.helper.IapHelper;
+import com.samsung.android.sdk.iap.lib2.listener.OnGetProductsDetailsListener;
+import com.samsung.android.sdk.iap.lib2.vo.ProductVo;
 
 import java.util.ArrayList;
 
@@ -18,9 +18,9 @@ import java.util.ArrayList;
 public class ProductsDetails extends BaseService {
     private static final String TAG = ProductsDetails.class.getSimpleName();
 
-    private OnGetProductsDetailsListener mOnGetProductsDetailsListener = null;
+    private com.samsung.android.sdk.iap.lib2.listener.OnGetProductsDetailsListener mOnGetProductsDetailsListener = null;
     private static String mProductIds = "";
-    protected ArrayList<ProductVo> mProductsDetails = null;
+    protected ArrayList<com.samsung.android.sdk.iap.lib2.vo.ProductVo> mProductsDetails = null;
 
     public ProductsDetails(IapHelper _iapHelper, Context _context, OnGetProductsDetailsListener _onGetProductsDetailsListener) {
         super(_iapHelper, _context);

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/BaseVo.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.vo;
+package com.samsung.android.sdk.iap.lib2.vo;
 
 import android.text.format.DateFormat;
 

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ConsumeVo.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.vo;
+package com.samsung.android.sdk.iap.lib2.vo;
 
 import android.util.Log;
 

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ErrorVo.java

@@ -1,6 +1,6 @@
-package com.samsung.android.sdk.iap.lib.vo;
+package com.samsung.android.sdk.iap.lib2.vo;
 
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib2.helper.HelperDefine;
 
 public class ErrorVo {
     private int mErrorCode = HelperDefine.IAP_PAYMENT_IS_CANCELED;

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/OwnedProductVo.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.vo;
+package com.samsung.android.sdk.iap.lib2.vo;
 
 import android.util.Base64;
 

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ProductVo.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.vo;
+package com.samsung.android.sdk.iap.lib2.vo;
 
 import org.json.JSONException;
 import org.json.JSONObject;

IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/PurchaseVo.java

@@ -1,4 +1,4 @@
-package com.samsung.android.sdk.iap.lib.vo;
+package com.samsung.android.sdk.iap.lib2.vo;
 
 import android.util.Base64;
 

Share/build.gradle

@@ -1,12 +1,18 @@
-apply plugin: 'com.android.library'
-apply plugin: 'img-optimizer'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
+//apply plugin: 'com.android.library'
+//apply plugin: 'img-optimizer'
+//apply plugin: 'kotlin-android'
+//apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-parcelize'
+    id 'img-optimizer'
+}
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    namespace "com.pdlive.shayu"
+    compileSdk rootProject.ext.android.compileSdkVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -33,7 +39,7 @@ android {
         versionName rootProject.ext.android.versionName
         manifestPlaceholders = rootProject.ext.manifestPlaceholders
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
     }
     aaptOptions {
@@ -48,8 +54,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
+    }
+    buildFeatures {
+        buildConfig = true
     }
 }
 repositories {

Share/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.pdlive.shayu">
+    >
 
     <queries>
         <package android:name="com.pdlive.shayu"/>
@@ -19,7 +19,7 @@
             tools:ignore="ExportedContentProvider" />
 
     </queries>
-    <application android:allowBackup="true">
+    <application>
         <activity
             android:name="com.facebook.FacebookActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"

Share/src/test/java/com/yunbao/share/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package com.yunbao.share;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}

app/build.gradle

@@ -4,32 +4,10 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.alibaba.arouter'
 android {
+    namespace "com.pandoralive.shayu"
     dexOptions {
         jumboMode = true
     }
-    project.tasks.getByName("tasks").doFirst {
-
-    }
-    /* flavorDimensions "packageApk"
-     productFlavors {
-         LinkTest {
-             dimension "packageApk"
-             manifestPlaceholders = [serverHost: "https://ceshi.yaoulive.com",isGooglePlay:0,isPluginModel:true]
-         }
-         LinkOfficial {
-             dimension "packageApk"
-             manifestPlaceholders = [serverHost: "https://napi.yaoulive.com",isGooglePlay:0,isPluginModel:true]
-         }
-         GoogleTest {
-             dimension "packageApk"
-             manifestPlaceholders = [serverHost: "https://ceshi.yaoulive.com",isGooglePlay:1,isPluginModel:false]
-         }
-         GoogleOfficial{
-             dimension "packageApk"
-             manifestPlaceholders = [serverHost: "https://napi.yaoulive.com",isGooglePlay:1,isPluginModel:false]
-         }
-
-     }*/
     /*  applicationVariants.all { variant ->
           variant.mergeAssetsProvider.configure {
               doLast {
@@ -53,9 +31,7 @@ android {
               }
           }
       }*/
-
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -125,8 +101,11 @@ android {
 
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
+    }
+    buildFeatures {
+        buildConfig = true
     }
     applicationVariants.all { variant ->
         println "清空build文件夹";
@@ -139,32 +118,19 @@ android {
         processManifestTask.doLast { pm ->
             String manifestPath = "build/intermediates/bundle_manifest/release/bundle-manifest/AndroidManifest.xml"
             def isGooglePlay = rootProject.ext.manifestPlaceholders.isGooglePlay
-            println "谷歌版本：" + isGooglePlay
-            println "文件存在" + file(manifestPath).exists()
-            println "" + (isGooglePlay != 0)
-            println "" + (file(manifestPath).exists() && isGooglePlay != 0)
-            if (file(manifestPath).exists() && isGooglePlay != 0) {
+            if (file(manifestPath).exists() && isGooglePlay) {
                 def manifestContent = file(manifestPath).getText()
-                println "移除权限"
+
                 manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />', '')
-                manifestContent = manifestContent.replace('android.permission.REQUEST_INSTALL_PACKAGES', '')
                 file(manifestPath).write(manifestContent)
             } else {
                 print "not Exists = " + manifestPath
             }
-            manifestPath = "build/intermediates/merged_manifests/release/processReleaseManifest/AndroidManifest.xml"
-            if (file(manifestPath).exists() && isGooglePlay != 0) {
-                def manifestContent = file(manifestPath).getText()
-                println "移除权限2"
-                manifestContent = manifestContent.replace('<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />', '')
-                manifestContent = manifestContent.replace('android.permission.REQUEST_INSTALL_PACKAGES', '')
-                file(manifestPath).write(manifestContent)
-            }
         }
         variant.mergeAssetsProvider.configure {
             doLast {
                 delete(fileTree(dir: outputDir, includes: ['model/ai_bgseg_green.bundle',
-                                                           //'model/ai_face_processor.bundle',
+                                                           'model/ai_face_processor.bundle',
                                                            //'model/ai_face_processor_lite.bundle',
                                                            'model/ai_hairseg.bundle',
                                                            'model/ai_hand_processor.bundle',
@@ -191,7 +157,7 @@ android {
                 ]))
                 println "isPluginModel = " + rootProject.ext.manifestPlaceholders.isPluginModel
                 if (rootProject.ext.manifestPlaceholders.isPluginModel) {
-                    delete(fileTree(dir: outputDir, includes: ['model/ai_face_processor.bundle',
+                    delete(fileTree(dir: outputDir, includes: ['model/ai_face_processor_lite.bundle',
                                                                'graphics/face_beautification.bundle']))
                 } else {
                     println "不删除bundle"
@@ -204,7 +170,7 @@ android {
                 isGoogle = "谷歌"
             } else if (rootProject.ext.manifestPlaceholders.isGooglePlay == 2) {
                 isGoogle = "Huawei"
-            } else if (rootProject.ext.manifestPlaceholders.isGooglePlay == 3) {
+            }else if (rootProject.ext.manifestPlaceholders.isGooglePlay == 3) {
                 isGoogle = "Samsung"
             }
             def isPlugin = "完整"
@@ -216,6 +182,7 @@ android {
                 isTest = "正式服"
             }
             outputFileName = "[${new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("GMT+8"))}]PDLive-${defaultConfig.versionName}-${isGoogle}-${isPlugin}-${variant.buildType.name}-${isTest}.apk"
+
         }
     }
     signingConfigs {
@@ -257,8 +224,7 @@ android {
         multiDexEnabled true
         ndk {
             // TODO: 谷歌商城需要兼容两个平台
-            //abiFilters "armeabi-v7a", "arm64-v8a"
-            abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
         javaCompileOptions {
             annotationProcessorOptions {

app/proguard-rules.pro

@@ -190,15 +190,16 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class org.greenrobot.eventbus.android.AndroidComponentsImpl*
 
 #--------ARouter
-
--keep public class com.alibaba.android.arouter.**{*;}
 -keep public class com.alibaba.android.arouter.routes.**{*;}
 -keep public class com.alibaba.android.arouter.facade.**{*;}
 -keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
 
-# If you use the byType method to obtain Service, add the following rules to protect the interface:
+# 如果使用了 byType 的方式获取 Service，需添加下面规则，保护接口
 -keep interface * implements com.alibaba.android.arouter.facade.template.IProvider
 
+# 如果使用了 单类注入，即不定义接口实现 IProvider，需添加下面规则，保护实现
+-keep class * implements com.alibaba.android.arouter.facade.template.IProvider
+
 # If single-type injection is used, that is, no interface is defined to implement IProvider, the following rules need to be added to protect the implementation
 # -keep class * implements com.alibaba.android.arouter.facade.template.IProvider
 
@@ -277,18 +278,6 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class tech.sud.mgp.hello.ui.main.settings.model.** {*;}
 -keep class tech.sud.mgp.hello.ui.main.nft.model.** {*;}
 -keep class tech.sud.mgp.hello.common.event.model.** {*;}
--keep class tech.sud.mgp.**{*;}
-
--keep class bitter.jnibridge.** { *; }
--keep class com.google.androidgamesdk.** { *; }
--keep class com.unity3d.** { *; }
--keep class do.do.do.** { *; }
--keep class do.if.do.** { *; }
--keep class for.do.** { *; }
--keep class if.do.do.do.** { *; }
--keep class org.fmod.** { *; }
--keep class tech.sud.** { *; }
--keep class tech.unity3d.** { *; }
 
 -keep class com.yunbao.common.sud.** {*;}
 
@@ -306,5 +295,3 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 
 -keep class com.shayu.lib_google.**{*;}
 -keep class com.shayu.lib_huawei.**{*;}
-
--keep class io.agora.**{*;}

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="myname.pdlive.shayu">
+  >
 
     <uses-permission
         android:name="android.permission.CALL_PHONE"
@@ -89,11 +89,6 @@
     <!--    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->
     <!--    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
-
-    <!-- 声网新增 -->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
-
     <queries>
         <package android:name="com.twitter.android" />
         <package android:name="jp.naver.line.android" />
@@ -162,12 +157,6 @@
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
             android:value="${isUploadLog}" />
-        <meta-data
-            android:name="BUILD_TIME"
-            android:value="${buildTime}" />
-        <meta-data
-            android:name="SW_RELEASE_MODEL"
-            android:value="${swReleaseModel}" />
         <meta-data
             android:name="com.openinstall.APP_KEY"
             android:value="smvslm" />

app/src/main/java/com/shayu/phonelive/AppContext.java

@@ -30,9 +30,8 @@ import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
 import com.tencent.imsdk.v2.V2TIMManager;
 import com.tencent.imsdk.v2.V2TIMSimpleMsgListener;
 import com.tencent.imsdk.v2.V2TIMUserInfo;
-import com.yunbao.common.http.Data;
-import com.yunbao.common.manager.OpenAdManager;
-import com.yunbao.common.utils.MobclickAgent;
+import com.umeng.analytics.MobclickAgent;
+import com.umeng.commonsdk.UMConfigure;
 import com.yunbao.common.BuildConfig;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
@@ -52,11 +51,9 @@ import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.live.socket.SocketReceiveBean;
 import com.yunbao.live.socket.SocketRyClient;
-import com.yunbao.live.socket.SocketSwClient;
 import com.yunbao.live.utils.LiveImDeletUtil;
 import com.yunbao.live.views.PortraitLiveManager;
 import com.yunbao.live.views.RecommendLiveRoomProvider;
-import com.yunbao.main.activity.LoginActivity;
 import com.yunbao.main.activity.MsgSettActivity;
 
 import org.greenrobot.eventbus.EventBus;
@@ -66,7 +63,6 @@ import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 import io.rong.imkit.config.RongConfigCenter;
@@ -112,31 +108,27 @@ public class AppContext extends CommonAppContext {
 
         @Override
         public void onActivityDestroyed(@NonNull Activity activity) {
-            AppManager.getInstance().removeActivity(activity);
             for (WeakReference<Activity> reference : activities) {
                 if (reference.get() == activity) {
                     activities.remove(reference);
                     return;
                 }
             }
-
+            AppManager.getInstance().removeActivity(activity);
         }
 
         @Override
         public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
             activities.add(new WeakReference<>(activity));
-            if (activity instanceof LoginActivity) {
-                AppManager.getInstance().clear();
-            }
             CrashSaveBean.getInstance().setActivitySize(activities);
             AppManager.getInstance().addActivity(activity);
-            OpenAdManager.getInstance().dismiss();
         }
 
         @Override
         public void onActivityStarted(@NonNull Activity activity) {
 
         }
+
     }
 
     @Override
@@ -150,7 +142,6 @@ public class AppContext extends CommonAppContext {
         registerError();
         registerFirebaseCrash();
         LogUtils.start(this);
-        //DebugDialog.getInstance().setParams("初始化","启动");
         sInstance = this;
         L.setDeBug(BuildConfig.DEBUG);
         AppEventsLogger.activateApp(this);
@@ -173,20 +164,20 @@ public class AppContext extends CommonAppContext {
             OpenInstall.init(this);
         }
         //设置LOG开关，默认为false
-        //UMConfigure.setLogEnabled(true);
+        UMConfigure.setLogEnabled(true);
 
 
         //友盟正式初始化
-        //UMConfigure.init(getApplicationContext(), "64e40ee55488fe7b3afa2c96", "PDLive", UMConfigure.DEVICE_TYPE_PHONE, "64e40ee55488fe7b3afa2c96");
+        UMConfigure.init(getApplicationContext(), "64e40ee55488fe7b3afa2c96", "PDLive", UMConfigure.DEVICE_TYPE_PHONE, "64e40ee55488fe7b3afa2c96");
 
         //集成umeng-crash-vx.x.x.aar，则需要关闭原有统计SDK异常捕获功能
         MobclickAgent.setCatchUncaughtExceptions(false);
         //PushSDK初始化(如使用推送SDK，必须调用此方法)
 
         //统计SDK是否支持采集在子进程中打点的自定义事件，默认不支持
-        //UMConfigure.setProcessEvent(true);//支持多进程打点
-        //MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO);
-        //UMConfigure.submitPolicyGrantResult(getApplicationContext(), true);
+        UMConfigure.setProcessEvent(true);//支持多进程打点
+        MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO);
+        UMConfigure.submitPolicyGrantResult(getApplicationContext(), true);
 
         registerActivityLifecycleCallbacks(new AdjustLifecycleCallbacks());
         //初始化 AndroidUtilCode
@@ -207,7 +198,7 @@ public class AppContext extends CommonAppContext {
         RongcloudIMManager.addRongcloudIMOnReceiveMessageListener(new RongIMClient.OnReceiveMessageWrapperListener() {
             @Override
             public boolean onReceived(io.rong.imlib.model.Message message, int i, boolean b, boolean b1) {
-                Log.e("wewe", message.getConversationType() + "112121  " + message.getContent());
+                Log.e("wewe", message.getConversationType() + "112121");
                 MessageIMManager.get(sInstance).getSystemForRongcloud(message);
                 //融云直播间聊天
                 Message msg = Message.obtain();
@@ -218,31 +209,6 @@ public class AppContext extends CommonAppContext {
                         if (content.getContent().contains("_method_")) {
                             msg.obj = content.getContent();
                             //观众页面
-
-                            String time = String.valueOf(new Date().getTime());
-                            //声网
-                            if (SocketSwClient.mSocketHandler != null && (TextUtils.equals("__system__", message.getTargetId()) || ("g" + PortraitLiveManager.liveID).contains(message.getTargetId()))) {
-                                SocketSwClient.mSocketHandler.sendMessage(msg);
-                            } else if (content.getContent().contains("LivePK_anchorStartLiveNotify")) {//开播通知
-                                SocketReceiveBean received = JSON.parseObject(content.getContent(), SocketReceiveBean.class);
-                                JSONObject map = received.getMsg().getJSONObject(0);
-                                sendStartAnchorLive(map);
-                            } else if (message.getTargetId().contains("v")) {
-                                /*String contentJson = ((TextMessage) message.getContent()).getContent();
-                                Log.e("wewe", contentJson);
-                                SudGameSocketImEvent sudGameSocketImEvent = new Gson().fromJson(contentJson, SudGameSocketImEvent.class);
-                                if (sudGameSocketImEvent.getMsg().isEmpty()) {
-                                    return false;
-                                }
-                                sudGameSocketImEvent.getMsg().get(0).setTime(time);
-                                Bus.get().post(sudGameSocketImEvent);*/
-                            }
-                            //主播页面
-                            if (TextUtils.isEmpty(PortraitLiveManager.liveID) && SocketSwClient.mSocketHandler != null) {
-                                SocketSwClient.mSocketHandler.sendMessage(msg);
-                            }
-
-                            //融云
                             if (SocketRyClient.mSocketHandler != null && (TextUtils.equals("__system__", message.getTargetId()) || ("g" + PortraitLiveManager.liveID).contains(message.getTargetId()))) {
                                 SocketRyClient.mSocketHandler.sendMessage(msg);
                             } else if (content.getContent().contains("LivePK_anchorStartLiveNotify")) {//开播通知
@@ -253,16 +219,13 @@ public class AppContext extends CommonAppContext {
                                 String contentJson = ((TextMessage) message.getContent()).getContent();
                                 Log.e("wewe", contentJson);
                                 SudGameSocketImEvent sudGameSocketImEvent = new Gson().fromJson(contentJson, SudGameSocketImEvent.class);
-                                if (sudGameSocketImEvent.getMsg().isEmpty()) {
-                                    return false;
-                                }
-                                sudGameSocketImEvent.getMsg().get(0).setTime(time);
                                 Bus.get().post(sudGameSocketImEvent);
                             }
                             //主播页面
                             if (TextUtils.isEmpty(PortraitLiveManager.liveID) && SocketRyClient.mSocketHandler != null) {
                                 SocketRyClient.mSocketHandler.sendMessage(msg);
                             }
+
                         } else if (message.getConversationType() == Conversation.ConversationType.PRIVATE) {//私聊信息
                             EventBus.getDefault().post(message);
                         }
@@ -311,7 +274,6 @@ public class AppContext extends CommonAppContext {
 
         });
         configSPApp();
-
         //初始化美颜SDK
         // FaceManager.initFaceUnity(this);
     }

app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java

@@ -29,6 +29,7 @@ import androidx.core.app.NotificationManagerCompat;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.pandoralive.shayu.R;
 import com.shayu.phonelive.AppContext;
 import com.tencent.rtmp.ITXLivePlayListener;
 import com.tencent.rtmp.TXLiveBase;
@@ -72,7 +73,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import myname.pdlive.shayu.R;
 
 /**
  * Created by cxf on 2018/9/17.
@@ -113,7 +113,6 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
         res.updateConfiguration(config, res.getDisplayMetrics());
         return res;
     }
-
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         getWindow().requestFeature(Window.FEATURE_ACTIVITY_TRANSITIONS);
@@ -145,11 +144,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
             }
         };
         mHandler.sendEmptyMessageDelayed(WHAT_GET_CONFIG, 1000);
-        try {
-            LogUtil.uploadErrorLog(AppContext.sInstance);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        LogUtil.uploadErrorLog(AppContext.sInstance);
         SpUtil.getInstance().setBooleanValue("NOTIFICATION", NotificationManagerCompat.from(this).areNotificationsEnabled());
     }
 
@@ -234,7 +229,7 @@ public class LauncherActivity extends AppCompatActivity implements View.OnClickL
                     } else {
                         checkUidAndToken();
                     }
-                } else {
+                }else{
                     ToastUtil.show(getString(R.string.net_error));
                 }
             }

app/src/main/java/com/shayu/phonelive/utils/CustomMessageReceiver.java

@@ -35,6 +35,7 @@ import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;
 import com.makeramen.roundedimageview.RoundedImageView;
+import com.pandoralive.shayu.R;
 import com.shayu.phonelive.AppContext;
 import com.shayu.phonelive.activity.LauncherActivity;
 import com.yunbao.common.bean.NotificationMsgBean;
@@ -51,7 +52,6 @@ import io.rong.imlib.ConnectChangeReceiver;
 import io.rong.push.PushType;
 import io.rong.push.notification.PushMessageReceiver;
 import io.rong.push.notification.PushNotificationMessage;
-import myname.pdlive.shayu.R;
 
 public class CustomMessageReceiver extends PushMessageReceiver {
 

baidu/build.gradle

@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
+    targetSdk  rootProject.ext.android.buildToolsVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -31,7 +31,7 @@ android {
         versionName rootProject.ext.android.versionName
         manifestPlaceholders = rootProject.ext.manifestPlaceholders
         ndk {
-            abiFilters "armeabi-v7a","arm64-v8a","x86","x86_64"
+            abiFilters "armeabi-v7a","arm64-v8a"
         }
     }
     buildTypes {
@@ -42,8 +42,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 repositories {

baidu/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.yunbao.baidu"
     />
 
 

beauty/build.gradle

@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    compileSdk rootProject.ext.android.compileSdkVersion
+    targetSdk  rootProject.ext.android.buildToolsVersion
     packagingOptions {
         pickFirst "lib/armeabi/libyuvutils.so"
         pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -31,7 +31,7 @@ android {
         versionName rootProject.ext.android.versionName
         manifestPlaceholders = rootProject.ext.manifestPlaceholders
         ndk {
-            abiFilters "armeabi-v7a","arm64-v8a","x86","x86_64"
+            abiFilters "armeabi-v7a","arm64-v8a"
         }
     }
     aaptOptions {
@@ -45,8 +45,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
     }
 }
 repositories {

beauty/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.yunbao.beauty"/>
+          />

build.gradle

@@ -4,27 +4,28 @@ apply from: "dependencies.gradle"
 
 
 buildscript {
-    ext.kotlin_version = '1.6.20'
+    ext.kotlin_version = '1.8.22'
     repositories {
         maven { url "https://mvn.mob.com/android" }
         maven { url 'https://maven.aliyun.com/repository/public' }
         maven { url 'https://maven.aliyun.com/repository/google' }
         maven { url 'https://maven.fabric.io/public' }
-        maven { url 'http://maven.faceunity.com/repository/maven-public/' }//美颜库
+        maven { url 'https://maven.faceunity.com/repository/maven-public/' }//美颜库
         maven { url 'https://repo1.maven.org/maven2/' }//埋点
         maven {url 'https://developer.huawei.com/repo/'}
+        maven { url "https://jitpack.io" }
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:8.3.1'
         //一键压缩png工具
         classpath 'com.chenenyu:img-optimizer:1.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
         classpath 'com.google.gms:google-services:4.3.3'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
-        classpath "com.alibaba:arouter-register:1.0.2"
+        classpath "com.github.jadepeakpoet.ARouter:arouter-register:1.0.3"
         classpath 'com.huawei.agconnect:agcp:1.5.2.300'
     }
 
@@ -40,9 +41,9 @@ allprojects {
         maven { url "https://mvn.mob.com/android" }
         maven { url 'https://maven.aliyun.com/repository/public' }
         maven { url 'https://maven.aliyun.com/repository/google' }
-        maven { url 'http://developer.huawei.com/repo'}//华为库
+        maven { url 'https://developer.huawei.com/repo'}//华为库
         maven { url 'https://maven.fabric.io/public' }
-        maven { url 'http://maven.faceunity.com/repository/maven-public/' }//美颜库
+        maven { url 'https://maven.faceunity.com/repository/maven-public/' }//美颜库
         maven { url "https://jitpack.io" }
         maven { url 'https://repo1.maven.org/maven2/' }//埋点
         google()  // Google's Maven repository
@@ -52,10 +53,4 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-ext {
-    IS_PUBLISH_LOCAL=true
-    LIB_VERSION="1.0.6"
-    AGORA_RTC_SDK= 'io.agora.rtc:agora-special-full:4.2.6.12'
-//    AGORA_RTC_SDK= "${rootProject.rootDir.absolutePath}/sdk"
-//    AGORA_RTC_SDK="io.agora.rtc:full-sdk:4.2.6"
-}
+

common/build.gradle

@@ -1,11 +1,10 @@
 apply plugin: 'com.android.library'
 apply plugin: 'img-optimizer'
-apply plugin: 'kotlin-android'
 
 
 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    namespace "com.yunbao.common"
+    compileSdk rootProject.ext.android.compileSdkVersion
 
     defaultConfig {
         minSdkVersion rootProject.ext.android.minSdkVersion
@@ -14,7 +13,7 @@ android {
         versionName rootProject.ext.android.versionName
         manifestPlaceholders = rootProject.ext.manifestPlaceholders
         ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
     }
 
@@ -54,8 +53,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
+    }
+    buildFeatures {
+        buildConfig = true
     }
 }
 repositories {
@@ -159,14 +161,14 @@ dependencies {
     //腾讯im
     api 'com.tencent.imsdk:imsdk-plus:5.4.666'
     api 'com.google.code.gson:gson:2.8.8'
-    api 'cn.rongcloud.sdk:rtc_lib:5.2.0' // 音视频通话基础能力库
+    api 'cn.rongcloud.sdk:rtc_lib:5.6.9' // 音视频通话基础能力库
     //此处以集成 5.1.2 版本为例
-    api 'cn.rongcloud.sdk:im_lib:5.2.0.2'
+    api 'cn.rongcloud.sdk:im_lib:5.6.10'
 
     //此处以集成 5.1.2 版本为例
-    api 'cn.rongcloud.sdk:im_kit:5.2.5.4' // 即时通讯 UI 基础组件
+    api 'cn.rongcloud.sdk:im_kit:5.6.10' // 即时通讯 UI 基础组件
     //融云小视频模块
-    api 'cn.rongcloud.sdk:sight:5.2.5.4'
+    api 'cn.rongcloud.sdk:sight:5.6.10'
     api 'com.facebook.android:facebook-android-sdk:15.2.0'
     implementation 'com.facebook.android:facebook-android-sdk:15.2.0'
 
@@ -201,7 +203,9 @@ dependencies {
     //自定义圆角图片
     api 'com.makeramen:roundedimageview:2.3.0'
     // 友盟统计SDK
-   // api(name: 'umeng-common-9.6.8+000', ext: 'aar')
+    api 'com.umeng.umsdk:common:9.6.3'// 必选
+    api 'com.umeng.umsdk:asms:1.8.0'// 必选
+    api 'com.umeng.umsdk:uyumao:1.1.2'
     //高级运营分析功能依赖库，使用卸载分析、开启反作弊能力请务必集成，以免影响高级功能使用。common需搭配v9.6.3及以上版本，asms需搭配v1.7.0及以上版本。需更新隐私声明。
     // 标准版本SudMGP SDK
     api 'tech.sud.mgp:SudMGP:1.3.3.1158'
@@ -212,22 +216,18 @@ dependencies {
     api 'com.yanzhenjie.recyclerview:x:1.3.2'
 
     //华为支付插件包
-    //api project(':lib_huawei')
+//    api project(':lib_huawei')
 
     //google插件包
     api project(':lib_google')
 
     //samsung插件包
-    api project(':IAP6Helper')
+    //api project(':IAP6Helper')
 
     //文字渐变色
     api 'com.github.FlyJingFish:GradientTextView:1.2.4'
     //轮播  一屏显示多个
     api 'com.github.xiaohaibin:XBanner:androidx_v1.2.6'
-    //声网SDK
-    //api 'io.agora.rtc:agora-special-full:4.2.6.245'
 
-    //ExoPlayer,腾讯的播放器不支持无缝切换
-    api 'com.google.android.exoplayer:exoplayer:2.18.2'
-    api 'com.google.android.exoplayer:exoplayer-core:2.18.2@aar'
+
 }

common/src/main/AndroidManifest.xml

@@ -1,11 +1,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yunbao.common">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!--    <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
     <!--    <uses-permission android:name="android.permission.INTERNET" />-->
     <!--    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />-->
 
-    <application android:allowBackup="true">
+    <application
+        android:allowBackup="true"
+        tools:replace="allowBackup"
+        >
 
         <!--        <meta-data-->
         <!--            android:name="com.google.ar.core"-->

common/src/main/java/com/yunbao/common/CommonAppConfig.java

@@ -37,8 +37,6 @@ public class CommonAppConfig {
     public static final boolean IS_UPLOAD_ERROR_LOG = getMetaDataBoolean("IS_UPLOAD_ERROR_LOG");
     //是否为插件包模式
     public static final boolean IS_PLUGIN_MODEL = getMetaDataBoolean("IS_PLUGIN_MODEL");
-    public static final String BUILD_TIME = getMetaDataString("BUILD_TIME");
-    public static final boolean IS_SW_RELEASE = getMetaDataBoolean("SW_RELEASE_MODEL");
 
     //外部sd卡
     public static final String DCMI_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath();
@@ -78,30 +76,7 @@ public class CommonAppConfig {
     public static boolean isGetNewWrap = false;//是否获取到新的包裹礼物
     public static int alert_time = 1;
     public static int alert_end_time = 1;
-    public static String SWToken = ""; //声网Token
-    public static final String SWChannelPrefix = "g";
-    //测试服
-    public static final String SWAPPId_debug = "4cf0376582d742ac8a96778b25b1079e";
-    //正式服
-    public static final String SWAPPId = "d4a5879524d74c20a7bdd667b0f2ca21";
 
-    public static String getSwAppId() {
-        if (IS_SW_RELEASE) {
-            return SWAPPId;
-        } else {
-            return SWAPPId_debug;
-        }
-    }
-
-
-    /**
-     * 获取通道
-     *
-     * @return
-     */
-    public static String getChannelName() {
-        return SWChannelPrefix + getInstance().getUid();
-    }
 
     private CommonAppConfig() {
 
@@ -144,7 +119,8 @@ public class CommonAppConfig {
 
     public String getUid() {
         if (TextUtils.isEmpty(mUid)) {
-            String[] uidAndToken = SpUtil.getInstance().getMultiStringValue(new String[]{SpUtil.UID, SpUtil.TOKEN});
+            String[] uidAndToken = SpUtil.getInstance()
+                    .getMultiStringValue(new String[]{SpUtil.UID, SpUtil.TOKEN});
             if (uidAndToken != null) {
                 if (!TextUtils.isEmpty(uidAndToken[0]) && !TextUtils.isEmpty(uidAndToken[1])) {
                     mUid = uidAndToken[0];
@@ -335,7 +311,9 @@ public class CommonAppConfig {
         mUid = null;
         mToken = null;
         mLoginIM = false;
-        SpUtil.getInstance().removeValue(SpUtil.UID, SpUtil.TOKEN, SpUtil.USER_INFO, SpUtil.IM_LOGIN);
+        SpUtil.getInstance().removeValue(
+                SpUtil.UID, SpUtil.TOKEN, SpUtil.USER_INFO, SpUtil.IM_LOGIN
+        );
     }
 
 
@@ -371,7 +349,12 @@ public class CommonAppConfig {
         mProvince = null;
         mCity = null;
         mDistrict = null;
-        SpUtil.getInstance().removeValue(SpUtil.LOCATION_LNG, SpUtil.LOCATION_LAT, SpUtil.LOCATION_PROVINCE, SpUtil.LOCATION_CITY, SpUtil.LOCATION_DISTRICT);
+        SpUtil.getInstance().removeValue(
+                SpUtil.LOCATION_LNG,
+                SpUtil.LOCATION_LAT,
+                SpUtil.LOCATION_PROVINCE,
+                SpUtil.LOCATION_CITY,
+                SpUtil.LOCATION_DISTRICT);
 
     }
 

common/src/main/java/com/yunbao/common/Constants.java

@@ -267,15 +267,11 @@ public class Constants {
     public static final String LIVE_PK_RANDOM_START="RankingStartRandomPK";
     public static final int LIVE_SDK_KSY = 0;//金山推流
     public static final int LIVE_SDK_TX = 1;//腾讯推流
-    public static final int LIVE_SDK_SW = 2;//声网
 
-    public static final String LIVE_SDK_IS_SW = "liveSdkIsSw"; //是否是聲網
 
     public static final int LINK_MIC_TYPE_NORMAL = 0;//观众与主播连麦
     public static final int LINK_MIC_TYPE_ANCHOR = 1;//主播与主播连麦
 
-    public static final String SOCKET_LIVE_ANCHOR_PK_DIALOG="GuildCompetitionNotice";//公会赛弹窗
-
     //视频举报获取位置
     public static int xIndex = 0;
     public static int yindex = 0;

common/src/main/java/com/yunbao/common/HtmlConfig.java

@@ -39,7 +39,7 @@ public class HtmlConfig {
     public static final String TURNTABLE_URL = CommonAppConfig.HOST + "/Appapi/Turntable/index";
 
     //在线商城
-    public static final String SHOP = CommonAppConfig.HOST + "/h5/shop/index.html";
+    public static final String SHOP = CommonAppConfig.HOST + "/h5/shoppingMall.html";
 
     //社区
     public static final String ENCOURAGE = CommonAppConfig.HOST + "/h5/shequ/index.html#/h5/shequ";

common/src/main/java/com/yunbao/common/activity/AbsActivity.java

@@ -6,7 +6,6 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Rect;
-import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -25,12 +24,13 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.yunbao.common.utils.MobclickAgent;
+import com.umeng.analytics.MobclickAgent;
 import com.yunbao.common.R;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.interfaces.LifeCycleListener;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.ClickUtil;
+import com.yunbao.common.utils.ToastUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -92,8 +92,7 @@ public abstract class AbsActivity extends AppCompatActivity {
     protected void main() {
 
     }
-
-    protected void create() {
+    protected void create(){
 
     }
 
@@ -108,17 +107,6 @@ public abstract class AbsActivity extends AppCompatActivity {
         }
     }
 
-    protected void setTitleBold(boolean bold) {
-        TextView titleView = (TextView) findViewById(R.id.titleView);
-        if (titleView != null) {
-            if (bold) {
-                titleView.setTypeface(Typeface.DEFAULT_BOLD);
-            } else {
-                titleView.setTypeface(Typeface.DEFAULT);
-            }
-        }
-    }
-
     public void backClick(View v) {
         if (v.getId() == R.id.btn_back) {
             onBackPressed();
@@ -193,14 +181,14 @@ public abstract class AbsActivity extends AppCompatActivity {
         //友盟统计
 //        MobclickAgent.onResume(this);
         MobclickAgent.onPageStart(this.mTag);
-        Log.e("MobclickAgent", "MobclickAgent:_onResume_" + this.mTag);
+        Log.e("MobclickAgent","MobclickAgent:_onResume_"+this.mTag);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
         MobclickAgent.onPageEnd(this.mTag);
-        Log.e("MobclickAgent", "MobclickAgent:_onPause_" + this.mTag);
+        Log.e("MobclickAgent","MobclickAgent:_onPause_"+this.mTag);
         if (mLifeCycleListeners != null) {
             for (LifeCycleListener listener : mLifeCycleListeners) {
                 listener.onPause();
@@ -394,12 +382,11 @@ public abstract class AbsActivity extends AppCompatActivity {
                 break;
         }
     }
-
-    public boolean isKefu(String url) {
-        if (url.contains("kefu")) {
+    public boolean isKefu(String url){
+        if(url.contains("kefu")){
             return true;
         }
-        if (url.contains("https://newkf.yaoulive.com/")) {
+        if(url.contains("https://newkf.yaoulive.com/")){
             return true;
         }
         return url.startsWith("https://kefu.yaoulive.com");

common/src/main/java/com/yunbao/common/activity/WebViewActivity.java

@@ -29,7 +29,6 @@ import com.lxj.xpopup.XPopup;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
-import com.yunbao.common.HtmlConfig;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.event.JavascriptInterfaceEvent;
@@ -101,6 +100,7 @@ public class WebViewActivity extends AbsActivity {
         ft_title = (FrameLayout) findViewById(R.id.ft_title);
         v_spacing = (View) findViewById(R.id.v_spacing);
         mWebView = findViewById(R.id.webView);
+
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
         params.topMargin = DpUtil.dp2px(1);
         // mWebView.setLayoutParams(params);
@@ -136,17 +136,11 @@ public class WebViewActivity extends AbsActivity {
                 if (url.contains("for")) {
                     mWebView.loadUrl("javascript:goAnchorTab()");
                 }
-
-
-                if(url.startsWith(HtmlConfig.SHOP)){
-                    //商店页不做动态变换
-                    return;
-                }
                 //真实屏幕高度-(ft_title的高度+导航栏高度)
                 //屏蔽掉是因为在线客服页面 AndroidBug5497Workaround会失效
                 int height = DeviceUtils.getScreenRealHeight(mContext) - DpUtil.dp2px(72) - getCurrentNavigationBarHeight(mContext);
                 if (!navigationGestureEnabled(mContext)) {
-                  //  view.loadUrl("javascript:window.androidObject.setHeight(" + height + ",0,false)");
+                    view.loadUrl("javascript:window.androidObject.setHeight(" + height + ",0,false)");
                 }
 
             }
@@ -200,8 +194,6 @@ public class WebViewActivity extends AbsActivity {
         mWebView.getSettings().setAllowFileAccess(true);
         mWebView.getSettings().setUseWideViewPort(true); // 关键点
         mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件
-        mWebView.setHorizontalScrollBarEnabled(false);
-        mWebView.setVerticalScrollBarEnabled(false);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
@@ -221,9 +213,6 @@ public class WebViewActivity extends AbsActivity {
             ft_title.setVisibility(View.VISIBLE);
             v_spacing.setVisibility(View.GONE);
         }
-        if(!StringUtil.isEmpty(url)&&url.startsWith(HtmlConfig.SHOP)){
-            ft_title.setVisibility(View.GONE);
-        }
     }
 
 
@@ -435,7 +424,7 @@ public class WebViewActivity extends AbsActivity {
                     LiveBean liveBean = JSON.parseObject(info[0], LiveBean.class);
                     new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
                         @Override
-                        public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) {
+                        public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
                             if (liveBean == null) {
                                 return;
                             }
@@ -451,7 +440,7 @@ public class WebViewActivity extends AbsActivity {
                                 }
                                 EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)));
                             } else {
-                                RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk),isSw);
+                                RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
                             }
                             finish();
                         }

common/src/main/java/com/yunbao/common/adapter/CustomDrawerPopupAdapter.java

@@ -40,15 +40,12 @@ public class CustomDrawerPopupAdapter extends RecyclerView.Adapter {
     private final int RIGHTS_INTERESTS = 4;
     private final int RECOMMEND = 5;
     private String liveId;
-    private boolean mIs_shengwang;
-
     private List<AnchorRecommendItemModel> list = new ArrayList<>();
 
     private List<CustomSidebarInfoModel> infoModels = new ArrayList<>();
 
-    public CustomDrawerPopupAdapter(Context mContext,boolean mIs_shengwang) {
+    public CustomDrawerPopupAdapter(Context mContext) {
         this.mContext = mContext;
-        this.mIs_shengwang = mIs_shengwang;
     }
 
 
@@ -117,7 +114,6 @@ public class CustomDrawerPopupAdapter extends RecyclerView.Adapter {
                     map.put("num", "9");
                     map.put("live_recommend", "sidebar");
                     map.put("refresh", "1");
-                    map.put(" is_shengwang", mIs_shengwang?"1":"0");
                     //推荐位
                     MainNetManager.get((Activity) mContext)
                             .anchorRecommend(map, new com.yunbao.common.http.base.HttpCallback<AnchorRecommendModel>() {

common/src/main/java/com/yunbao/common/adapter/DebugDialogAdapter.java

@@ -1,81 +0,0 @@
-package com.yunbao.common.adapter;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.yunbao.common.utils.StringUtil;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.TreeMap;
-
-public class DebugDialogAdapter extends RecyclerView.Adapter<DebugDialogAdapter.DebugViewHolder> {
-    HashMap<String, View> paramMap = new HashMap<>();
-    private Context mContext;
-
-    public DebugDialogAdapter(Context mContext) {
-        this.mContext = mContext;
-    }
-
-    public void setParamMap(HashMap<String, View> paramMap) {
-        Log.i("debug弹窗", "setParamMap: 添加值到view " + paramMap.size());
-        this.paramMap = paramMap;
-        notifyDataSetChanged();
-    }
-
-    @NonNull
-    @Override
-    public DebugViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        Log.i("debug弹窗", "onCreateViewHolder: 创建适配器");
-        return new DebugViewHolder(new LinearLayout(mContext));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull DebugViewHolder holder, int position) {
-        List<String> list = new ArrayList<>(paramMap.keySet());
-        Log.i("debug弹窗", "onBindViewHolder: 添加值到view " + list.size() + "|" + paramMap.size());
-        holder.setData(list.get(position), paramMap.get(list.get(position)));
-    }
-
-    @Override
-    public int getItemCount() {
-        Log.i("debug弹窗", "getItemCount: " + paramMap.size());
-        return paramMap.size();
-    }
-
-    public class DebugViewHolder extends RecyclerView.ViewHolder {
-
-        public DebugViewHolder(@NonNull View itemView) {
-            super(itemView);
-        }
-
-        public void setData(String msg, View view) {
-            Log.i("debug弹窗", "setData: 添加值到view " + view + "|" + msg + "|" + ((LinearLayout) itemView).indexOfChild(view));
-            if (view instanceof TextView && StringUtil.isEmpty(((TextView) view).getText().toString())) {
-                ((TextView) view).setText(msg);
-            }
-            int indexOfChild = ((LinearLayout) itemView).indexOfChild(view);
-            if (indexOfChild != -1) {
-                if (((LinearLayout) itemView).getChildAt(indexOfChild) instanceof TextView) {
-                    ((TextView) ((LinearLayout) itemView).getChildAt(indexOfChild)).setText(msg);
-                } else {
-                    ((LinearLayout) itemView).removeViewAt(indexOfChild);
-                }
-            } else {
-                if (view.getParent() != null) {
-                    ((ViewGroup) view.getParent()).removeView(view);
-                }
-                ((LinearLayout) itemView).addView(view);
-            }
-        }
-    }
-}

common/src/main/java/com/yunbao/common/adapter/ImagePreviewAdapter.java

@@ -1,112 +0,0 @@
-package com.yunbao.common.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.PagerSnapHelper;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.yunbao.common.R;
-
-
-/**
- * Created by cxf on 2018/11/28.
- */
-
-public class ImagePreviewAdapter extends RecyclerView.Adapter<ImagePreviewAdapter.Vh> {
-
-    private LayoutInflater mInflater;
-    private ActionListener mActionListener;
-    private int mPageCount;
-    private LinearLayoutManager mLayoutManager;
-    private int mCurPosition;
-
-    public ImagePreviewAdapter(Context context, int pageCount) {
-        mPageCount = pageCount;
-        mInflater = LayoutInflater.from(context);
-    }
-
-    @NonNull
-    @Override
-    public Vh onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new Vh(mInflater.inflate(R.layout.item_preview_img, parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull Vh vh, int position) {
-        vh.setData(position);
-    }
-
-    @Override
-    public int getItemCount() {
-        return mPageCount;
-    }
-
-
-    class Vh extends RecyclerView.ViewHolder {
-
-        ImageView mImg;
-
-        public Vh(View itemView) {
-            super(itemView);
-            mImg = (ImageView) itemView;
-        }
-
-        void setData(int position) {
-            if (mActionListener != null) {
-                mActionListener.loadImage(mImg, position);
-            }
-        }
-    }
-
-    public void setActionListener(ActionListener actionListener) {
-        mActionListener = actionListener;
-    }
-
-    public void setCurPosition(int curPosition) {
-        mCurPosition = curPosition;
-        if (mActionListener != null) {
-            mActionListener.onPageChanged(curPosition);
-        }
-    }
-
-    public int getCurPosition(){
-        return mCurPosition;
-    }
-
-    @Override
-    public void onAttachedToRecyclerView(RecyclerView recyclerView) {
-        super.onAttachedToRecyclerView(recyclerView);
-        mLayoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
-        PagerSnapHelper pagerSnapHelper = new PagerSnapHelper();
-        pagerSnapHelper.attachToRecyclerView(recyclerView);
-        recyclerView.setOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-            }
-
-            @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                int position = mLayoutManager.findFirstCompletelyVisibleItemPosition();
-                if (position >= 0 && mCurPosition != position) {
-                    mCurPosition = position;
-                    if (mActionListener != null) {
-                        mActionListener.onPageChanged(position);
-                    }
-                }
-            }
-        });
-    }
-
-
-    public interface ActionListener {
-        void onPageChanged(int position);
-
-        void loadImage(ImageView imageView, int position);
-    }
-}

common/src/main/java/com/yunbao/common/adapter/InteractionGamesAdapter.java

@@ -18,14 +18,10 @@ import com.yunbao.common.views.InteractionGamesChildViewHolder;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * 侧边栏游戏列表适配器，改游戏列表数量在这里改
- */
 public class InteractionGamesAdapter extends RecyclerView.Adapter {
     private Context mContext;
     private boolean rigts;
     private List<CustomSidebarChildModel> child = new ArrayList<>();
-    private List<CustomSidebarChildModel> srcChild = new ArrayList<>();
 
     public InteractionGamesAdapter(Context mContext, boolean rigts) {
         this.mContext = mContext;
@@ -50,7 +46,7 @@ public class InteractionGamesAdapter extends RecyclerView.Adapter {
                 long activityID = TextUtils.isEmpty(model.getSrc()) ? 0 : Long.parseLong(model.getSrc());
                 if (activityID != 0) {
                     Bus.get().post(new CustomDrawerPopupEvent()
-                            .setDisMiss(true).setInteractionID(activityID).setInteraction(true).setChild(srcChild));
+                            .setDisMiss(true).setInteractionID(activityID).setInteraction(true).setChild(child));
                 }
 
 
@@ -65,7 +61,6 @@ public class InteractionGamesAdapter extends RecyclerView.Adapter {
 
     public void updateData(List<CustomSidebarChildModel> mChild) {
         child.clear();
-        srcChild.clear();
         if (mChild.size() > 8) {
             for (int i = 0; i < 8; i++) {
                 child.add(mChild.get(i));
@@ -73,7 +68,6 @@ public class InteractionGamesAdapter extends RecyclerView.Adapter {
         } else {
             child.addAll(mChild);
         }
-        srcChild.addAll(mChild);
         notifyDataSetChanged();
     }
 

common/src/main/java/com/yunbao/common/adapter/LiveNewRoleInteractionGamesAdapter.java

@@ -67,14 +67,13 @@ public class LiveNewRoleInteractionGamesAdapter extends RecyclerView.Adapter {
 
     public void updateData(List<CustomSidebarChildModel> mChild) {
         child.clear();
-       /* if (mChild.size() > 8) {
+        if (mChild.size() > 8) {
             for (int i = 0; i < 8; i++) {
                 child.add(mChild.get(i));
             }
         } else {
             child.addAll(mChild);
-        }*/
-            child.addAll(mChild);
+        }
         notifyDataSetChanged();
     }
 

common/src/main/java/com/yunbao/common/bean/AiAutomaticSpeechModel.java

@@ -1,9 +1,6 @@
 package com.yunbao.common.bean;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.google.gson.annotations.SerializedName;
-import com.yunbao.common.utils.StringUtil;
-import com.yunbao.common.utils.WordUtil;
 
 /**
  * 机器人助手IM消息
@@ -24,9 +21,6 @@ public class AiAutomaticSpeechModel extends BaseModel {
     //标签图片
     @SerializedName("icon")
     private String icon;
-    @SerializedName("icon_en")
-    @JSONField(name = "icon_en")
-    private String iconEn;
     //气泡背景
     @SerializedName("system_bubble")
     private String systemBubble;
@@ -41,7 +35,7 @@ public class AiAutomaticSpeechModel extends BaseModel {
     }
 
     public String getAiName() {
-        return aiName + ":";
+        return aiName+":";
     }
 
     public AiAutomaticSpeechModel setAiName(String aiName) {
@@ -53,16 +47,6 @@ public class AiAutomaticSpeechModel extends BaseModel {
         return content;
     }
 
-
-    public String getIconEn() {
-        return iconEn;
-    }
-
-    public AiAutomaticSpeechModel setIconEn(String iconEn) {
-        this.iconEn = iconEn;
-        return this;
-    }
-
     public AiAutomaticSpeechModel setContent(String content) {
         this.content = content;
         return this;
@@ -78,9 +62,6 @@ public class AiAutomaticSpeechModel extends BaseModel {
     }
 
     public String getIcon() {
-        if (!WordUtil.isNewZh() && !StringUtil.isEmpty(iconEn)) {
-            return iconEn;
-        }
         return icon;
     }
 

common/src/main/java/com/yunbao/common/bean/AvatarBean.java

@@ -1,25 +0,0 @@
-package com.yunbao.common.bean;
-
-public class AvatarBean extends BaseModel {
-    private String avatar;
-    private String avatarThumb;
-
-    public AvatarBean() {
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getAvatarThumb() {
-        return avatarThumb;
-    }
-
-    public void setAvatarThumb(String avatarThumb) {
-        this.avatarThumb = avatarThumb;
-    }
-}

common/src/main/java/com/yunbao/common/bean/CheckLiveModel.java

@@ -2,7 +2,6 @@ package com.yunbao.common.bean;
 
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
-import com.yunbao.common.BuildConfig;
 
 public class CheckLiveModel extends BaseModel {
 
@@ -14,16 +13,6 @@ public class CheckLiveModel extends BaseModel {
     private String typeMsg;
     @SerializedName("live_sdk")
     private String liveSdk;
-    @SerializedName("is_shengwang")
-    private String isShengwang;
-
-    public String getIsShengwang() {
-        return isShengwang;
-    }
-
-    public void setIsShengwang(String isShengwang) {
-        this.isShengwang = isShengwang;
-    }
 
     public static CheckLiveModel objectFromData(String str) {
 

common/src/main/java/com/yunbao/common/bean/ConfigBean.java

@@ -2,8 +2,6 @@ package com.yunbao.common.bean;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.google.gson.annotations.SerializedName;
-import com.yunbao.common.BuildConfig;
-import com.yunbao.common.utils.StringUtil;
 
 import java.util.Arrays;
 import java.util.List;
@@ -61,9 +59,6 @@ public class ConfigBean extends BaseModel {
     private String txPlayUgcLicenceUrl;//腾讯短视频鉴权
     private String txVideoUgcKey;
     private String google_isup;
-
-    private String sud_game_speech;
-
     @SerializedName("is_return_user")//是否需要弹窗（0否，1是）
     private String isReturnUser="";
     @SerializedName("popup_img_url")//弹窗图片地址
@@ -187,20 +182,6 @@ public class ConfigBean extends BaseModel {
                 '}';
     }
 
-
-    public boolean isSw(){
-        return getSud_game_speech().equals("1");
-    }
-
-    @JSONField(name = "sud_game_speech")
-    public String getSud_game_speech() {
-        return sud_game_speech;
-    }
-
-    public void setSud_game_speech(String sud_game_speech) {
-        this.sud_game_speech = sud_game_speech;
-    }
-
     @JSONField(name = "apk_ver")
     public String getVersion() {
         return version;

common/src/main/java/com/yunbao/common/bean/EnterRoomInfoModel.java

@@ -114,17 +114,6 @@ public class EnterRoomInfoModel extends BaseModel {
     @SerializedName("gift_wall_lighten_total")
     private String giftWallLightenTotal;
 
-    @SerializedName("connection_info")
-    private LivePkMicModel connectionInfo;
-
-    public LivePkMicModel getConnectionInfo() {
-        return connectionInfo;
-    }
-
-    public void setConnectionInfo(LivePkMicModel connectionInfo) {
-        this.connectionInfo = connectionInfo;
-    }
-
     public String getGiftWallLightenNumber() {
         return giftWallLightenNumber;
     }

common/src/main/java/com/yunbao/common/bean/EnterRoomNewModel.java

@@ -41,7 +41,6 @@ public class EnterRoomNewModel extends BaseModel {
     private SudGameDateModel sudGameDateModel;
     @SerializedName("quick_gift_remaining_quantity")
     private int quickGiftRemainingQuantity;//剩余的小PD礼物数量
-
     @SerializedName("if_viewing_duration_complete")
     private int ifViewingDurationComplete;//通过观看时间获取小PD礼物的次数
     @SerializedName("sendMoneyLongStatus")

common/src/main/java/com/yunbao/common/bean/LiveBattlePassRewardsBean.java

@@ -7,21 +7,12 @@ import java.util.Map;
 
 public class LiveBattlePassRewardsBean extends BaseModel{
     private int level;
-    private int is_received;
     private List<BattlePassType> live_battle_pass_type;
     private Map<Integer,Map<Integer,LiveBattlePassReward>> live_battle_pass_rewards;
 
     public LiveBattlePassRewardsBean() {
     }
 
-    public int getIs_received() {
-        return is_received;
-    }
-
-    public void setIs_received(int is_received) {
-        this.is_received = is_received;
-    }
-
     public int getLevel() {
         return level;
     }

common/src/main/java/com/yunbao/common/bean/LivePkMicModel.java

@@ -1,36 +0,0 @@
-package com.yunbao.common.bean;
-
-import com.google.gson.annotations.SerializedName;
-
-public class LivePkMicModel extends BaseModel {
-    @SerializedName("pkuid")
-    private String pkuid;
-    @SerializedName("pkuname")
-    private String pkuname;
-    @SerializedName("pkuimg")
-    private String pkuimg;
-
-    public String getPkuid() {
-        return pkuid;
-    }
-
-    public void setPkuid(String pkuid) {
-        this.pkuid = pkuid;
-    }
-
-    public String getPkuname() {
-        return pkuname;
-    }
-
-    public void setPkuname(String pkuname) {
-        this.pkuname = pkuname;
-    }
-
-    public String getPkuimg() {
-        return pkuimg;
-    }
-
-    public void setPkuimg(String pkuimg) {
-        this.pkuimg = pkuimg;
-    }
-}

common/src/main/java/com/yunbao/common/bean/OpenAdModel.java

@@ -2,6 +2,7 @@ package com.yunbao.common.bean;
 
 import com.google.gson.annotations.SerializedName;
 import com.yunbao.common.CommonAppConfig;
+import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.StringUtil;
 
 import java.text.ParseException;
@@ -21,8 +22,6 @@ public class OpenAdModel extends BaseModel {
     public static final int SHOW_ONE = 3;//3. 仅弹出一次；
     @SerializedName("id")
     private int id;
-    @SerializedName("popup_name")
-    private String name;
     @SerializedName("popup_location")
     private int type = TYPE_HOME;
     @SerializedName("activity_url")
@@ -36,27 +35,24 @@ public class OpenAdModel extends BaseModel {
     @SerializedName("popup_model")
     private int model = MODEL_SQUARE;
     @SerializedName("start_show_time")
-    private String startTime;//活动开始时间 1
+    private String startTime;//活动开始时间
     @SerializedName("end_show_time")
-    private String endTime;//活动结束时间 5
+    private String endTime;//活动结束时间
     @SerializedName("popup_permission")
     private int permission;
     @SerializedName("popup_frequency")
     private int showModel = SHOW_DEF;//显示模式，1：杀死程序后弹出 2：指定时间内（本机时间） 3：1. 仅弹出一次
     @SerializedName("popup_frequency_time")
-    private String section = "0";// SHOW_DEF = 2  1
-    @SerializedName("popup_sort")
-    private int popupSort = 1;//弹框类型 1.图片 2.H5
-    @SerializedName("sort")
-    private int sort = 0;
+    private String section = "0";// SHOW_DEF = 2
+
 
     public OpenAdModel() {
     }
 
     public static OpenAdModel createTestData() {
         OpenAdModel model = new OpenAdModel();
-        model.id = 3;
-        model.type = 1;
+        model.id=3;
+        model.type=1;
         model.url = "/h5/GuildTournament/20230821/rank.html";
         model.imageUrl = "https://ceshi.yaoulive.com/data/upload/20230913/1694589490.png";
         model.showTime = 10;
@@ -70,30 +66,6 @@ public class OpenAdModel extends BaseModel {
         return model;
     }
 
-    public int getPopupSort() {
-        return popupSort;
-    }
-
-    public int getSort() {
-        return sort;
-    }
-
-    public void setSort(int sort) {
-        this.sort = sort;
-    }
-
-    public void setPopupSort(int popupSort) {
-        this.popupSort = popupSort;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public int getShowModel() {
         return showModel;
     }
@@ -119,13 +91,12 @@ public class OpenAdModel extends BaseModel {
     }
 
     public String getUrl() {
-        if (!url.startsWith("http://") && !url.startsWith("https://")) {
-            url = CommonAppConfig.HOST + (url.startsWith("/") ? url : "/" + url);
+        if (!url.startsWith("http://") || !url.startsWith("https://")) {
+            url = CommonAppConfig.HOST + url;
         }
-        return url;
+        return url + "?t=" + System.currentTimeMillis() / 1000;
     }
-
-    public String getOriginalUrl() {
+    public String getOriginalUrl(){
         return url;
     }
 
@@ -227,7 +198,6 @@ public class OpenAdModel extends BaseModel {
     public String toString() {
         return "OpenAdModel{" +
                 "id=" + id +
-                ", name='" + name + '\'' +
                 ", type=" + type +
                 ", url='" + url + '\'' +
                 ", imageUrl='" + imageUrl + '\'' +
@@ -236,10 +206,7 @@ public class OpenAdModel extends BaseModel {
                 ", model=" + model +
                 ", startTime='" + startTime + '\'' +
                 ", endTime='" + endTime + '\'' +
-                ", permission=" + permission +
-                ", showModel=" + showModel +
-                ", section='" + section + '\'' +
-                ", sort=" + popupSort +
+                ", permission='" + permission + '\'' +
                 '}';
     }
 }

common/src/main/java/com/yunbao/common/bean/RedPacketInfoModel.java

@@ -49,16 +49,6 @@ public class RedPacketInfoModel extends BaseModel {
     //超级红包ID
     @SerializedName("super_jackpot_id")
     private String superJackpotId;
-    @SerializedName("red_packet_type")
-    private int redPacketType;// 1.普通红包 2.特殊红包
-
-    public int getRedPacketType() {
-        return redPacketType;
-    }
-
-    public void setRedPacketType(int redPacketType) {
-        this.redPacketType = redPacketType;
-    }
 
     public String getSuperJackpotId() {
         return superJackpotId;

common/src/main/java/com/yunbao/common/bean/SwTokenModel.java

@@ -1,23 +0,0 @@
-package com.yunbao.common.bean;
-
-/**
- * 声网token
- */
-public class SwTokenModel extends BaseModel {
-    private String token;
-
-    public SwTokenModel() {
-    }
-
-    public SwTokenModel(String token) {
-        this.token = token;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-}

common/src/main/java/com/yunbao/common/bean/UserBean.java

@@ -67,6 +67,7 @@ public class UserBean implements Parcelable {
     //随机天梯排位赛PK img，仅在主播PK时使用
     private String mRankPkImgUrl;
     //是否填写完整资料
+    @SerializedName("user_info_complete")
     private int user_info_complete;
     //粉丝团等级
     private int fansLevel;
@@ -109,6 +110,14 @@ public class UserBean implements Parcelable {
         return user_info_complete;
     }
 
+    public int getUser_info_complete() {
+        return user_info_complete;
+    }
+
+    public void setUser_info_complete(int user_info_complete) {
+        this.user_info_complete = user_info_complete;
+    }
+
     public UserBean seUserInfoComplete(int userInfoComplete) {
         this.user_info_complete = userInfoComplete;
         return this;
@@ -865,20 +874,11 @@ public class UserBean implements Parcelable {
         private String medal;
         private String bubble;
         private String medal_new;
-        private String medal_new_en;
 
         public String getMedal_new() {
             return medal_new;
         }
 
-        public String getMedal_new_en() {
-            return medal_new_en;
-        }
-
-        public void setMedal_new_en(String medal_new_en) {
-            this.medal_new_en = medal_new_en;
-        }
-
         public void setMedal_new(String medal_new) {
             this.medal_new = medal_new;
         }
@@ -907,66 +907,6 @@ public class UserBean implements Parcelable {
             this.bubble = bubble;
         }
     }
-
-    @Override
-    public String toString() {
-        return "UserBean{" +
-                "id='" + id + '\'' +
-                ", userNiceName='" + userNiceName + '\'' +
-                ", avatar='" + avatar + '\'' +
-                ", avatarThumb='" + avatarThumb + '\'' +
-                ", sex=" + sex +
-                ", signature='" + signature + '\'' +
-                ", coin='" + coin + '\'' +
-                ", gold='" + gold + '\'' +
-                ", votes='" + votes + '\'' +
-                ", consumption='" + consumption + '\'' +
-                ", votestotal='" + votestotal + '\'' +
-                ", province='" + province + '\'' +
-                ", city='" + city + '\'' +
-                ", location='" + location + '\'' +
-                ", birthday='" + birthday + '\'' +
-                ", level=" + level +
-                ", levelAnchor=" + levelAnchor +
-                ", lives=" + lives +
-                ", follows=" + follows +
-                ", fans=" + fans +
-                ", vip=" + vip +
-                ", liang=" + liang +
-                ", car=" + car +
-                ", medal_level=" + medal_level +
-                ", medal_name='" + medal_name + '\'' +
-                ", Dress=" + Dress +
-                ", noble_id='" + noble_id + '\'' +
-                ", yuanbao='" + yuanbao + '\'' +
-                ", noble_name='" + noble_name + '\'' +
-                ", islive='" + islive + '\'' +
-                ", medal_no_display_src='" + medal_no_display_src + '\'' +
-                ", hot_num='" + hot_num + '\'' +
-                ", goodnum='" + goodnum + '\'' +
-                ", fans_pic='" + fans_pic + '\'' +
-                ", gifticon='" + gifticon + '\'' +
-                ", department_name='" + department_name + '\'' +
-                ", token_rong='" + token_rong + '\'' +
-                ", noble_end_time='" + noble_end_time + '\'' +
-                ", slide='" + slide + '\'' +
-                ", users_type='" + users_type + '\'' +
-                ", is_bind='" + is_bind + '\'' +
-                ", mobile='" + mobile + '\'' +
-                ", front_task='" + front_task + '\'' +
-                ", is_admin='" + is_admin + '\'' +
-                ", praise=" + praise +
-                ", isHide=" + isHide +
-                ", randomPk=" + randomPk +
-                ", mRankPkImgUrl='" + mRankPkImgUrl + '\'' +
-                ", user_info_complete=" + user_info_complete +
-                ", fansLevel=" + fansLevel +
-                ", typeMic=" + typeMic +
-                ", isMicList=" + isMicList +
-                ", isRequest=" + isRequest +
-                ", fansEnterRoomUrl='" + fansEnterRoomUrl + '\'' +
-                '}';
-    }
 }
 
 

common/src/main/java/com/yunbao/common/dialog/CinemaTicketPopupWindow.java

@@ -14,7 +14,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 
 import com.lxj.xpopup.core.CenterPopupView;
-import com.yunbao.common.utils.MobclickAgent;
+import com.umeng.analytics.MobclickAgent;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.CoolConfig;
 import com.yunbao.common.http.base.HttpCallback;

common/src/main/java/com/yunbao/common/dialog/CreateSudGamePopup.java

@@ -20,7 +20,6 @@ import com.google.gson.Gson;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.core.BottomPopupView;
 import com.lxj.xpopup.enums.PopupPosition;
-import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.CreateSudRoomModel;
 import com.yunbao.common.bean.CustomSidebarChildModel;
@@ -46,9 +45,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Random;
 
-/**
- * 半屏创建游戏房间
- */
 public class CreateSudGamePopup extends BottomPopupView {
     private List<CustomSidebarChildModel> customSidebarChildModels = new ArrayList<>();
     private TextView createGameType, selectCurrencyType;
@@ -154,6 +150,8 @@ public class CreateSudGamePopup extends BottomPopupView {
                             .asCustom(new SudGameListSelectPopup(getContext(), 4, customSidebarChildModels, interactionID))
                             .show();
                 }
+
+
             }
         });
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.room_back),
@@ -281,11 +279,7 @@ public class CreateSudGamePopup extends BottomPopupView {
                             public void onSuccess(CreateSudRoomModel data) {
                                 if (isHome) {
                                     dialog.dismiss();
-                                    if(CommonAppConfig.getInstance().getConfig().isSw()){
-                                        RouteUtil.forwardSwSudGameActivity(new Gson().toJson(data),true,isHome);
-                                    }else{
-                                        RouteUtil.forwardRySudGameActivity(new Gson().toJson(data),true,isHome);
-                                    }
+                                    RouteUtil.forwardSudGameActivity(new Gson().toJson(data));
                                 } else {
                                     Bus.get().post(new LiveSudGamePopupShowOrHideEvent().setType(0).setCreateSudRoomModel(data));
 
@@ -318,50 +312,20 @@ public class CreateSudGamePopup extends BottomPopupView {
                 animator.setDuration(animDuration);
                 animator.setInterpolator(new LinearInterpolator());
                 animator.start();
-                if (hasMoveUp) {
-                    InputMethodManager imm = getSystemService(getContext(), InputMethodManager.class);
-                    if (imm != null) {
-                        imm.hideSoftInputFromWindow(roomName.getWindowToken(), 0);
-                        imm.hideSoftInputFromWindow(gameSill.getWindowToken(), 0);
-                    }
-                    new Handler().postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.currency_type));
-                            builder.hasShadowBg(false)
-                                    .isDestroyOnDismiss(true)
-                                    .isLightStatusBar(false)
-                                    .popupPosition(PopupPosition.Bottom)
-                                    .asCustom(new SudGameListSelectPopup(getContext(), 5, currencyTypeName,isYuanbao)
-                                            .setOnDismissListener(new DialogInterface.OnDismissListener() {
-                                                @Override
-                                                public void onDismiss(DialogInterface dialog) {
-                                                    closeAnimSudGameListEvent();
-                                                }
-                                            })
-                                    )
-                                    .show();
-                        }
-                    }, 500);
-                }else {
-                    XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.currency_type));
-                    builder.hasShadowBg(false)
-                            .isDestroyOnDismiss(true)
-                            .isLightStatusBar(false)
-                            .popupPosition(PopupPosition.Bottom)
-                            .asCustom(new SudGameListSelectPopup(getContext(), 5, currencyTypeName,isYuanbao)
-                                    .setOnDismissListener(new DialogInterface.OnDismissListener() {
-                                        @Override
-                                        public void onDismiss(DialogInterface dialog) {
-                                            closeAnimSudGameListEvent();
-                                        }
-                                    })
-                            )
-                            .show();
-                }
-
-
-
+                XPopup.Builder builder = new XPopup.Builder(getContext()).atView(findViewById(R.id.currency_type));
+                builder.hasShadowBg(false)
+                        .isDestroyOnDismiss(true)
+                        .isLightStatusBar(false)
+                        .popupPosition(PopupPosition.Bottom)
+                        .asCustom(new SudGameListSelectPopup(getContext(), 5, currencyTypeName,isYuanbao)
+                                .setOnDismissListener(new DialogInterface.OnDismissListener() {
+                                    @Override
+                                    public void onDismiss(DialogInterface dialog) {
+                                        closeAnimSudGameListEvent();
+                                    }
+                                })
+                        )
+                        .show();
             }
         });
     }

common/src/main/java/com/yunbao/common/dialog/DebugDialog.java

@@ -1,172 +0,0 @@
-package com.yunbao.common.dialog;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.lzf.easyfloat.EasyFloat;
-import com.lzf.easyfloat.enums.ShowPattern;
-import com.lzf.easyfloat.interfaces.OnPermissionResult;
-import com.lzf.easyfloat.permission.PermissionUtils;
-import com.yunbao.common.CommonAppConfig;
-import com.yunbao.common.adapter.DebugDialogAdapter;
-import com.yunbao.common.utils.AppManager;
-import com.yunbao.common.utils.ToastUtil;
-
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Timer;
-import java.util.TimerTask;
-
-
-public class DebugDialog {
-    RecyclerView recyclerView;
-    LinkedHashMap<String, View> params;
-    DebugDialogAdapter adapter;
-    private static DebugDialog debugDialog;
-    Context mContext;
-    private ShowPattern showPattern = ShowPattern.CURRENT_ACTIVITY;
-
-    private DebugDialogRunnable runnable;
-
-    public static void getInstance(DebugDialogRunnable runnable) {
-        if (debugDialog == null) {
-            debugDialog = new DebugDialog(runnable);
-        } else {
-            runnable.run(debugDialog);
-        }
-        debugDialog.showPattern = ShowPattern.CURRENT_ACTIVITY;
-    }
-
-    public static boolean checkShow() {
-        return EasyFloat.isShow("debug");
-    }
-
-    public DebugDialog clear() {
-        params.clear();
-        return this;
-    }
-
-    public void setParams(String tag, String msg) {
-        Log.i("debug弹窗", "setParams: " + tag + "|" + msg);
-        if (params.containsKey(tag)) {
-            ((TextView) params.get(tag)).setText(tag + ":" + msg);
-        } else {
-            TextView textView = new TextView(mContext);
-            textView.setText(tag + ":" + msg);
-            params.put(tag, textView);
-            adapter.setParamMap(params);
-        }
-        EasyFloat.updateFloat("debug");
-    }
-
-    private DebugDialog(DebugDialogRunnable runnable) {
-        this.runnable = runnable;
-        if (params == null) {
-            Log.i("debug弹窗", "DebugDialog: 初始化参数");
-            params = new LinkedHashMap<>();
-        }
-        init();
-    }
-
-    private void init() {
-        this.mContext = AppManager.getInstance().getMainActivity();
-        if (mContext == null) {
-            startWaitMainActivity();
-            return;
-        }
-        runnable.run(this);
-        //   createView();
-    }
-
-    private void startWaitMainActivity() {
-        new Timer().schedule(new TimerTask() {
-            @Override
-            public void run() {
-                Log.i("debug弹窗", "run: " + AppManager.getInstance().getMainActivity());
-                if (AppManager.getInstance().getMainActivity() != null) {
-                    init();
-                    cancel();
-                }
-            }
-        }, 0, 1000);
-    }
-
-    public void close() {
-        EasyFloat.dismiss("debug");
-    }
-
-    public void show() {
-        if (recyclerView != null) return;
-        if (showPattern == ShowPattern.CURRENT_ACTIVITY) {
-            createView();
-            return;
-        }
-        if (PermissionUtils.checkPermission(mContext)) {
-            createView();
-        } else {
-            PermissionUtils.requestPermission((Activity) mContext, new OnPermissionResult() {
-                @Override
-                public void permissionResult(boolean b) {
-                    ToastUtil.show("悬浮权限" + b);
-                    if (b) {
-                        createView();
-                    }
-                }
-            });
-        }
-    }
-
-    protected void createView() {
-        recyclerView = new RecyclerView(mContext);
-        adapter = new DebugDialogAdapter(mContext);
-        recyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
-        recyclerView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-        recyclerView.setAdapter(adapter);
-        recyclerView.setBackgroundColor(Color.WHITE);
-        TextView textView = new TextView(mContext);
-        textView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                ToastUtil.show("debug弹窗:" + params.size());
-                EasyFloat.updateFloat("debug");
-            }
-        });
-        params.put("发包时间:" + CommonAppConfig.BUILD_TIME, textView);
-        adapter.setParamMap(params);
-
-        EasyFloat.with(mContext)
-                .setTag("debug")
-                .setShowPattern(this.showPattern)
-                .setLayout(recyclerView)
-                .show();
-        runnable.run(this);
-        Log.i("debug弹窗", "createView: 创建");
-    }
-
-    public void setView(String value, View view, View.OnClickListener onClickListener) {
-        if (params.containsKey(value)) {
-            params.get(value).setOnClickListener(onClickListener);
-        } else {
-            view.setOnClickListener(onClickListener);
-            params.put(value, view);
-        }
-        adapter.setParamMap(params);
-        EasyFloat.updateFloat("debug");
-    }
-
-    public void setShowPattern(ShowPattern showPattern) {
-        this.showPattern = showPattern;
-    }
-
-    public interface DebugDialogRunnable {
-        void run(DebugDialog dialog);
-    }
-}

common/src/main/java/com/yunbao/common/dialog/ImagePreviewDialog.java

@@ -1,160 +0,0 @@
-package com.yunbao.common.dialog;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ValueAnimator;
-import android.os.Bundle;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.animation.AccelerateDecelerateInterpolator;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.yunbao.common.R;
-import com.yunbao.common.adapter.ImagePreviewAdapter;
-import com.yunbao.common.utils.StringUtil;
-
-/**
- * Created by Martin on 2024/3/15.
- * 图片预览弹窗
- */
-
-public class ImagePreviewDialog extends AbsDialogFragment implements View.OnClickListener {
-
-    private View mBg;
-    private RecyclerView mRecyclerView;
-    private ValueAnimator mAnimator;
-    private int mPosition;
-    private int mPageCount;
-    private ActionListener mActionListener;
-    private TextView mCount;
-    private ImagePreviewAdapter mAdapter;
-    private boolean mNeedDelete;
-
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.view_preview_image;
-    }
-
-    @Override
-    protected int getDialogStyle() {
-        return R.style.dialog2;
-    }
-
-    @Override
-    protected boolean canCancel() {
-        return true;
-    }
-
-    @Override
-    protected void setWindowAttributes(Window window) {
-        WindowManager.LayoutParams params = window.getAttributes();
-        params.width = WindowManager.LayoutParams.MATCH_PARENT;
-        params.height = WindowManager.LayoutParams.MATCH_PARENT;
-        window.setAttributes(params);
-    }
-
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        mBg = mRootView.findViewById(R.id.bg);
-        mCount = (TextView) findViewById(R.id.count);
-        findViewById(R.id.btn_close).setOnClickListener(this);
-        if (mNeedDelete) {
-            View btnDelete = findViewById(R.id.btn_delete);
-            btnDelete.setVisibility(View.VISIBLE);
-            btnDelete.setOnClickListener(this);
-        }
-        mRecyclerView = mRootView.findViewById(R.id.recyclerView);
-        mRecyclerView.setHasFixedSize(true);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false));
-        mAnimator = ValueAnimator.ofFloat(0, 1);
-        mAnimator.setDuration(150);
-        mAnimator.setInterpolator(new AccelerateDecelerateInterpolator());
-        mAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                float v = (float) animation.getAnimatedValue();
-                mBg.setAlpha(v);
-            }
-        });
-        mAnimator.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                if (mRecyclerView != null && mPageCount > 0) {
-                    ImagePreviewAdapter adapter = new ImagePreviewAdapter(mContext, mPageCount);
-                    mAdapter = adapter;
-                    adapter.setActionListener(new ImagePreviewAdapter.ActionListener() {
-                        @Override
-                        public void onPageChanged(int position) {
-                            if (mCount != null) {
-                                mCount.setText(StringUtil.contact(String.valueOf(position + 1), "/", String.valueOf(mPageCount)));
-                            }
-                        }
-
-                        @Override
-                        public void loadImage(ImageView imageView, int position) {
-                            if (mActionListener != null) {
-                                mActionListener.loadImage(imageView, position);
-                            }
-                        }
-                    });
-                    mRecyclerView.setAdapter(adapter);
-                    if (mPosition >= 0 && mPosition < mPageCount) {
-                        adapter.setCurPosition(mPosition);
-                        mRecyclerView.scrollToPosition(mPosition);
-                    }
-                }
-            }
-        });
-        mAnimator.start();
-    }
-
-    public void setImageInfo(int pageCount, int position, boolean needDelete, ActionListener actionListener) {
-        mActionListener = actionListener;
-        mPageCount = pageCount;
-        mPosition = position;
-        mNeedDelete = needDelete;
-    }
-
-
-    @Override
-    public void onDestroy() {
-        if (mAnimator != null) {
-            mAnimator.cancel();
-        }
-        mContext = null;
-        mActionListener = null;
-        super.onDestroy();
-    }
-
-    @Override
-    public void onClick(View v) {
-        int i = v.getId();
-        if (i == R.id.btn_close) {
-            dismiss();
-        } else if (i == R.id.btn_delete) {
-            delete();
-        }
-    }
-
-    private void delete() {
-        if (mAdapter != null && mActionListener != null) {
-            mActionListener.onDeleteClick(mAdapter.getCurPosition());
-        }
-        dismiss();
-    }
-
-    public interface ActionListener {
-        void loadImage(ImageView imageView, int position);
-
-        void onDeleteClick(int position);
-    }
-
-}

common/src/main/java/com/yunbao/common/dialog/LiveNewRolePopup.java

@@ -21,7 +21,6 @@ import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.List;
 
-//游戏弹窗
 public class LiveNewRolePopup extends BottomPopupView {
     private boolean showRed = false;
 

common/src/main/java/com/yunbao/common/dialog/OpenAdBottomDialogPopup.java

@@ -1,11 +1,7 @@
 package com.yunbao.common.dialog;
 
-import android.app.Activity;
 import android.content.Context;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 
@@ -13,21 +9,12 @@ import com.lxj.xpopup.XPopup;
 import com.yunbao.common.R;
 import com.yunbao.common.activity.WebViewActivity;
 import com.yunbao.common.bean.OpenAdModel;
-import com.yunbao.common.event.JavascriptInterfaceEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.interfaces.OnItemClickListener;
-import com.yunbao.common.manager.IMLoginManager;
-import com.yunbao.common.utils.DpUtil;
-import com.yunbao.common.utils.JavascriptInterfaceUtils;
-import com.yunbao.common.utils.L;
-import com.yunbao.common.utils.ScreenDimenUtil;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 
 public class OpenAdBottomDialogPopup extends AbsDialogPopupWindow {
+    private ImageView mImageView;
     private ImageView mClose;
-    private LinearLayout contentLayout;
     private OpenAdModel model;
     private OnItemClickListener<OpenAdModel> mListener;
 
@@ -40,11 +27,6 @@ public class OpenAdBottomDialogPopup extends AbsDialogPopupWindow {
     @Override
     public void buildDialog(XPopup.Builder builder) {
         builder.animationDuration(0);
-        builder.hasShadowBg(true);
-        if(model.getPopupSort()==2){
-            builder.dismissOnTouchOutside(false);
-            builder.dismissOnBackPressed(false);
-        }
     }
 
     @Override
@@ -69,63 +51,8 @@ public class OpenAdBottomDialogPopup extends AbsDialogPopupWindow {
     @Override
     protected void onCreate() {
         super.onCreate();
-        contentLayout = findViewById(R.id.content_layout);
+        mImageView = findViewById(R.id.img);
         mClose = findViewById(R.id.close);
-        if (model.getPopupSort() == 1) {
-            setImage();
-        } else {
-            setWeb();
-        }
-
-        mClose.setOnClickListener(v -> dismiss());
-        if (model.getShowTime() > 0) {
-            mClose.postDelayed(this::dismiss, model.getShowTime());
-        }
-    }
-
-    private void setWeb() {
-        WebView mWebView = new WebView(mContext);
-        mWebView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
-        mWebView.addJavascriptInterface(JavascriptInterfaceUtils.getInstance().setmContext((Activity) mContext, mWebView).setPageClose(true).setLiveZhuangBana(false), "androidObject");
-        mWebView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); // 是否允许JS打开新窗口
-        mWebView.getSettings().setJavaScriptEnabled(true);
-        mWebView.getSettings().setDomStorageEnabled(true);
-        String appCachePath = mContext.getCacheDir().getAbsolutePath();
-//        mWebView.getSettings().setAppCachePath(appCachePath);
-        mWebView.getSettings().setAllowFileAccess(true);
-        mWebView.getSettings().setUseWideViewPort(true); // 关键点
-        mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件
-        mWebView.setHorizontalScrollBarEnabled(false);
-        mWebView.setVerticalScrollBarEnabled(false);
-        mWebView.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                L.e("H5-------->" + url);
-                view.loadUrl(url);
-
-                return true;
-            }
-
-            @Override
-            public void onPageFinished(WebView view, String url) {
-            }
-        });
-        String url=model.getUrl();
-        if(url.contains("?")){
-            url+="&uid="+ IMLoginManager.get(mContext).getUserInfo().getId()+"&token="+IMLoginManager.get(mContext).getUserInfo().getToken();
-        }else{
-            url+="?uid="+ IMLoginManager.get(mContext).getUserInfo().getId()+"&token="+IMLoginManager.get(mContext).getUserInfo().getToken();
-        }
-        mWebView.loadUrl(url);
-        contentLayout.addView(mWebView);
-    }
-
-    private void setImage() {
-        int width = ScreenDimenUtil.getInstance().getScreenWdith();
-        int height = (int) (width * 1.4);
-
-        ImageView mImageView = new ImageView(mContext);
-        mImageView.setLayoutParams(new LinearLayout.LayoutParams(width, height));
         mImageView.setOnClickListener(v -> {
             WebViewActivity.forward(mContext, model.getUrl(), model.getType() != OpenAdModel.TYPE_HOME);
             if (mListener != null) {
@@ -134,12 +61,10 @@ public class OpenAdBottomDialogPopup extends AbsDialogPopupWindow {
             }
             dismiss();
         });
+        mClose.setOnClickListener(v -> dismiss());
         ImgLoader.display(mContext, model.getImageUrl(), mImageView);
-        contentLayout.addView(mImageView);
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onJavascriptInterfaceEvent(JavascriptInterfaceEvent event) {
-
+        if (model.getShowTime() > 0) {
+            mClose.postDelayed(this::dismiss, model.getShowTime());
+        }
     }
 }

common/src/main/java/com/yunbao/common/dialog/OpenAdCenterDialogPopup.java

@@ -1,44 +1,24 @@
 package com.yunbao.common.dialog;
 
-import android.app.Activity;
 import android.content.Context;
-import android.graphics.Color;
 import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.view.WindowInsets;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.lxj.xpopup.XPopup;
-import com.lzf.easyfloat.enums.ShowPattern;
 import com.yunbao.common.R;
 import com.yunbao.common.activity.WebViewActivity;
 import com.yunbao.common.bean.OpenAdModel;
-import com.yunbao.common.event.JavascriptInterfaceEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.interfaces.OnItemClickListener;
-import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.DpUtil;
-import com.yunbao.common.utils.JavascriptInterfaceUtils;
-import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ScreenDimenUtil;
-import com.yunbao.common.utils.ToastUtil;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 
 public class OpenAdCenterDialogPopup extends AbsDialogFullScreenPopupWindow {
     private ImageView mImageView;
-    private LinearLayout contentLayout;
     private ImageView mClose;
     private OpenAdModel model;
     private OnItemClickListener<OpenAdModel> mListener;
@@ -59,8 +39,7 @@ public class OpenAdCenterDialogPopup extends AbsDialogFullScreenPopupWindow {
 
     @Override
     public void buildDialog(XPopup.Builder builder) {
-        builder.hasShadowBg(true);
-        builder.shadowBgColor(Color.parseColor("#80000000"));
+        builder.hasShadowBg(false);
         builder.animationDuration(0);
     }
 
@@ -82,103 +61,12 @@ public class OpenAdCenterDialogPopup extends AbsDialogFullScreenPopupWindow {
     @Override
     protected void onCreate() {
         super.onCreate();
-        Log.e("-----弹窗-----", "onCreate: 创建弹窗");
-        contentLayout = findViewById(R.id.content_layout);
+        Log.e("-----弹窗-----", "onCreate: 创建弹窗" );
+        mImageView = findViewById(R.id.img);
         mClose = findViewById(R.id.close);
-
-
-        contentLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            boolean isShow = false;
-
-            @Override
-            public void onGlobalLayout() {
-                if (isShow)
-                    return;
-                isShow = true;
-                int width = contentLayout.getWidth() - DpUtil.dp2px(20);
-                int height = (int) (width * 1.5);
-                if (model.getModel() == OpenAdModel.MODEL_SQUARE) {
-                    height = (int) (width * 1.2);
-                }
-                Log.i("-----弹窗-----", "高度：" + height + " 宽度：" + width + " 屏幕宽度: " + ScreenDimenUtil.getInstance().getScreenWdith());
-                /*DebugDialog.getInstance(new DebugDialog.DebugDialogRunnable() {
-                    @Override
-                    public void run(DebugDialog dialog) {
-                        dialog.setShowPattern(ShowPattern.ALL_TIME);
-                        dialog.show();
-                        int width = contentLayout.getWidth() - DpUtil.dp2px(10);
-                        int height = (int) (width * 1.5);
-                        if (model.getModel() == OpenAdModel.MODEL_SQUARE) {
-                            height = (int) (width * 1.2);
-                        }
-                        Log.i("-----弹窗-----", "弹框debug高宽  高度：" + height + " 宽度：" + width);
-                        dialog.setParams(model.getName() + "弹框高宽", "高度：" + height + " 宽度：" + width);
-                    }
-                });*/
-                if (model.getPopupSort() == 1) {
-                    setImage(model, width, height);
-                    findViewById(R.id.layout).setOnClickListener(v -> dismiss());
-                } else {
-                    setWeb(model, width, height);
-                }
-                mClose.setOnClickListener(v -> dismiss());
-                if (model.getShowTime() > 0) {
-                    mClose.postDelayed(OpenAdCenterDialogPopup.this::dismiss, model.getShowTime());
-                }
-            }
-        });
-
-    }
-
-    private void setWeb(OpenAdModel model, int width, int height) {
-        WebView mWebView = new WebView(mContext);
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(width, height);
-        params.gravity = Gravity.CENTER;
-        mWebView.setLayoutParams(params);
-        mWebView.addJavascriptInterface(JavascriptInterfaceUtils.getInstance().setmContext((Activity) mContext, mWebView).setPageClose(true).setLiveZhuangBana(false), "androidObject");
-        mWebView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); // 是否允许JS打开新窗口
-        mWebView.getSettings().setJavaScriptEnabled(true);
-        mWebView.getSettings().setDomStorageEnabled(true);
-        String appCachePath = mContext.getCacheDir().getAbsolutePath();
-//        mWebView.getSettings().setAppCachePath(appCachePath);
-        mWebView.getSettings().setAllowFileAccess(true);
-        mWebView.getSettings().setUseWideViewPort(true); // 关键点
-        mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件
-        mWebView.setHorizontalScrollBarEnabled(false);
-        mWebView.setVerticalScrollBarEnabled(false);
-        mWebView.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                L.e("H5-------->" + url);
-                view.loadUrl(url);
-
-                return true;
-            }
-
-            @Override
-            public void onPageFinished(WebView view, String url) {
-            }
-        });
-        String url = model.getUrl();
-        if (url.contains("?")) {
-            url += "&uid=" + IMLoginManager.get(mContext).getUserInfo().getId() + "&token=" + IMLoginManager.get(mContext).getUserInfo().getToken();
-        } else {
-            url += "?uid=" + IMLoginManager.get(mContext).getUserInfo().getId() + "&token=" + IMLoginManager.get(mContext).getUserInfo().getToken();
-        }
-        Log.i("-----弹窗-----", "setWeb: " + url);
-        mWebView.loadUrl(url);
-        contentLayout.addView(mWebView);
-    }
-
-    private void setImage(OpenAdModel model, int width, int height) {
-        mImageView = new ImageView(mContext);
-        mImageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(width, height);
-        params.gravity = Gravity.CENTER;
-        mImageView.setLayoutParams(params);
-
+        findViewById(R.id.layout).setOnClickListener(v -> dismiss());
         mImageView.setOnClickListener(v -> {
-            if ("home_page_banner_battle".equals(model.getOriginalUrl())) {
+            if("home_page_banner_battle".equals(model.getOriginalUrl())){
                 RouteUtil.forwardBattlePass();
                 dismiss();
                 return;
@@ -190,12 +78,19 @@ public class OpenAdCenterDialogPopup extends AbsDialogFullScreenPopupWindow {
             }
             dismiss();
         });
+        mClose.setOnClickListener(v -> dismiss());
         ImgLoader.display(mContext, model.getImageUrl(), mImageView);
-        contentLayout.addView(mImageView);
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onJavascriptInterfaceEvent(JavascriptInterfaceEvent event) {
-
+        int width = ScreenDimenUtil.getInstance().getScreenWdith() - DpUtil.dp2px(40);
+        int height = (int) (width * 1.4);
+        if (model.getModel() == OpenAdModel.MODEL_SQUARE) {
+            height = width;
+        }
+        ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mImageView.getLayoutParams();
+        params.width = width;
+        params.height = height;
+        mImageView.setLayoutParams(params);
+        if (model.getShowTime() > 0) {
+            mClose.postDelayed(this::dismiss, model.getShowTime());
+        }
     }
 }

common/src/main/java/com/yunbao/common/dialog/SudGameListSelectPopup.java

@@ -19,7 +19,6 @@ import com.yunbao.common.event.LiveSudGameHistoryEvent;
 import com.yunbao.common.event.RoomHolderTypeEvent;
 import com.yunbao.common.event.SudGameListEvent;
 import com.yunbao.common.event.SudGameListSillEvent;
-import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.utils.Bus;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
@@ -88,11 +87,6 @@ public class SudGameListSelectPopup extends AttachPopupView {
         if (mType == 0 || mType == 4) {
             topSelect.setText(getContext().getString(R.string.interactive_game_room_all));
             for (int i = 0; i < customSidebarChildModels.size(); i++) {
-               /* if (!IMLoginManager.get(getContext()).getUserInfo().anchorUserType()) {
-                    if ("1490944230389182466".equals(customSidebarChildModels.get(i).getSrc())) {//友尽闯关
-                        continue;
-                    }
-                }*/
                 selectString.add(customSidebarChildModels.get(i).getTitle());
                 if (TextUtils.equals(String.valueOf(interactionID), customSidebarChildModels.get(i).getSrc())) {
                     index = i;

common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java

@@ -115,36 +115,6 @@ public class SendBlindGiftEvent extends BaseModel {
     private String liveGiftNotify;
     @SerializedName("userNiceName")
     private String userNiceName;
-    @SerializedName("special_gift")
-    private int specialGift;
-    @SerializedName("special_gift_name")
-    private String specialGiftName;
-    @SerializedName("special_gift_name_en")
-    private String specialGiftNameEn;
-
-    public int getSpecialGift() {
-        return specialGift;
-    }
-
-    public void setSpecialGift(int specialGift) {
-        this.specialGift = specialGift;
-    }
-
-    public String getSpecialGiftName() {
-        return specialGiftName;
-    }
-
-    public void setSpecialGiftName(String specialGiftName) {
-        this.specialGiftName = specialGiftName;
-    }
-
-    public String getSpecialGiftNameEn() {
-        return specialGiftNameEn;
-    }
-
-    public void setSpecialGiftNameEn(String specialGiftNameEn) {
-        this.specialGiftNameEn = specialGiftNameEn;
-    }
 
     public String getUserNiceName() {
         return userNiceName;

common/src/main/java/com/yunbao/common/event/SubGameEvent.java

@@ -1,44 +0,0 @@
-package com.yunbao.common.event;
-
-import com.yunbao.common.bean.HttpCallbackModel;
-
-public class SubGameEvent {
-    int type;
-    HttpCallbackModel model;
-    String dataJson;
-
-    public SubGameEvent(int type, HttpCallbackModel model, String dataJson) {
-        this.type = type;
-        this.model = model;
-        this.dataJson = dataJson;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public HttpCallbackModel getModel() {
-        return model;
-    }
-
-    public void setModel(HttpCallbackModel model) {
-        this.model = model;
-    }
-
-    public String getDataJson() {
-        return dataJson;
-    }
-
-    @Override
-    public String toString() {
-        return "SubGameEvent{" +
-                "type=" + type +
-                ", model=" + model +
-                ", dataJson='" + dataJson + '\'' +
-                '}';
-    }
-}

common/src/main/java/com/yunbao/common/event/SudGameSocketImEvent.java

@@ -53,15 +53,6 @@ public class SudGameSocketImEvent extends BaseModel {
         private String method;
         @SerializedName("equipment")
         private String equipment;
-        private String time;
-
-        public String getTime() {
-            return time;
-        }
-
-        public void setTime(String time) {
-            this.time = time;
-        }
 
         public String getAction() {
             return action;

common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java

@@ -42,7 +42,7 @@ import java.util.Locale;
  */
 
 public class CommonHttpUtil {
-    public static final String GET_UPLOAD_QI_NIU_TOKEN = "getUploadQiNiuToken";
+
 
     /**
      * 初始化
@@ -450,16 +450,6 @@ public class CommonHttpUtil {
     public static void getUserBaseinfo(String touid, HttpCallback callback) {
         HttpClient.getInstance().get("User.getUserBaseinfo", CommonHttpConsts.GET_USER_BASEINFO).params("touid", touid).execute(callback);
     }
-    /**
-     * 上传文件 获取七牛云token的接口
-     */
-    public static void getUploadQiNiuToken(HttpCallback callback, boolean isImg) {
-        HttpClient.getInstance().get("Pdluserhome.getQiNiuToken2", "Pdluserhome.getQiNiuToken2")
-                .params("uid", CommonAppConfig.getInstance().getUid())
-                .params("token", CommonAppConfig.getInstance().getToken())
-                .params("ext", isImg ? ".jpeg" : ".mp4")
-                .execute(callback);
-    }
 //
 //    //埋点唯一性
 //    public static void setAdvertisingChannels(String operation, HttpCallback callback) {

common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java

@@ -764,7 +764,7 @@ public class LiveHttpUtil {
      * @param file     封面图片文件
      * @param callback
      */
-    public static void newcreateRoom(String title, int liveClassId, int type, int typeVal, File file, int clarityType,boolean isSw, HttpCallback callback) {
+    public static void newcreateRoom(String title, int liveClassId, int type, int typeVal, File file, int clarityType, HttpCallback callback) {
 
         PostRequest<JsonBean> request = HttpClient.getInstance().post("Live.createRoom2", LiveHttpConsts.CREATE_ROOM)
                 .params("title", title)
@@ -773,7 +773,6 @@ public class LiveHttpUtil {
                 .params("landscape", "2")
                 .params("class_type", "0")
                 .params("type_val", typeVal)
-                .params("is_shengwang",isSw?1:0)
                 .params("clarityType", clarityType);
         if (file != null) {
             request.params("file", file);
@@ -818,15 +817,6 @@ public class LiveHttpUtil {
                 .execute(callback);
     }
 
-    /**
-     * 获取是否是声网开播
-     * @param callback
-     */
-    public static void getIsSw(HttpCallback callback) {
-        HttpClient.getInstance().get("Tx.setRtcFirm", "Tx.setRtcFirm")
-                .execute(callback);
-    }
-
     /**
      * 腾讯sdk 跟主播连麦时，获取主播的低延时流
      */

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.yunbao.common.bean.ActiveModel;
 import com.yunbao.common.bean.AnchorRecommendItemModel;
 import com.yunbao.common.bean.AnchorRecommendModel;
-import com.yunbao.common.bean.AvatarBean;
 import com.yunbao.common.bean.BaseModel;
 import com.yunbao.common.bean.BattlePassPoints;
 import com.yunbao.common.bean.BattlePassTask;
@@ -71,7 +70,6 @@ import com.yunbao.common.bean.StarChallengeStatusModel;
 import com.yunbao.common.bean.SudGameUserModel;
 import com.yunbao.common.bean.SudRoomListModel;
 import com.yunbao.common.bean.SudgameCodeModel;
-import com.yunbao.common.bean.SwTokenModel;
 import com.yunbao.common.bean.UserAreaBean;
 import com.yunbao.common.bean.UserAvatarSelectBean;
 import com.yunbao.common.bean.VipModel;
@@ -84,13 +82,10 @@ import java.util.List;
 import java.util.Map;
 
 import io.reactivex.Observable;
-import okhttp3.MultipartBody;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
 import retrofit2.http.GET;
-import retrofit2.http.Multipart;
 import retrofit2.http.POST;
-import retrofit2.http.Part;
 import retrofit2.http.Query;
 import retrofit2.http.QueryMap;
 
@@ -116,7 +111,7 @@ public interface PDLiveApi {
             @Field("uuid_Device") String uuidDevice,
             @Field("pushid") String pushid,
             @Field("lastlogindevice") String lastlogindevice,
-            @Field("langue") String langue
+            @Field("langue")String langue
     );
 
     /**
@@ -216,7 +211,7 @@ public interface PDLiveApi {
     );
 
     /**
-     * 关注主播···································································
+     * 关注主播
      *
      * @param liveuid
      * @return
@@ -1191,48 +1186,10 @@ public interface PDLiveApi {
 
     @GET("/api/public/?service=Guard.participateMoneyLong")
     Observable<ResponseModel<String>> participateMoneyLong(@Query("liveuid") String liveUid, @Query("send_money_long_key") String sendMoneyLongKey);
-
     @GET("/api/public/?service=Guard.endSendMoneyLong")
     Observable<ResponseModel<SendMoneyLongModel>> endSendMoneyLong(@Query("liveuid") String liveUid, @Query("send_money_long_key") String sendMoneyLongKey);
-
     @GET("/api/public/?service=Guard.checkUpgrades")
     Observable<ResponseModel<CheckUpgradesModel>> checkUpgrades(@Query("liveuid") String liveUid);
-
     @GET("/api/public/?service=Guard.getRewards")
-    Observable<ResponseModel<Object>> guardGetRewards(@Query("guard_level") String guardLevel, @Query("liveuid") String liveUid);
-
-    @Multipart
-    @POST("/api/public/?service=Pdlinfos.updateAvatar")
-    Observable<ResponseModel<AvatarBean>> updateFile(@Part MultipartBody.Part file, @Query("uid") String uid, @Query("token") String token);
-
-    @GET("/api/public/?service=User.userFeedback")
-    Observable<ResponseModel<List<BaseModel>>> feedback(@Query("problem_description") String content, @Query("problem_image") String images, @Query("contact_information") String ci);
-
-
-    @GET("/api/public/?service=User.userFeedbackRestrict")
-    Observable<ResponseModel<List<BaseModel>>> checkFeedback();
-
-    /**
-     *
-     * @param roomId 房间ID
-     * @param cmd 事件名称 生命值:addHeart 自动跳:hit
-     * @param value 价格
-     * @param gameId 游戏ID
-     * @param fromUid 付费用户uid
-     * @param toUid 目标用户uid
-     * @param payload 附加值
-     * @return
-     */
-    @GET("/api/public/?service=Sudgameserver.createOrder")
-    Observable<ResponseModel<List<BaseModel>>> createGameOrder(
-            @Query("room_id")String roomId,
-            @Query("cmd")String cmd,
-            @Query("value")String value,
-            @Query("mg_id")String gameId,
-            @Query("from_uid")String fromUid,
-            @Query("to_uid")String toUid,
-            @Query("payload")String payload
-    );
-    @GET("/api/public/?service=Tx.getShengwangToken")
-    Observable<ResponseModel<SwTokenModel>> getSwToken();
+    Observable<ResponseModel<Object>> guardGetRewards(@Query("guard_level") String guardLevel,@Query("liveuid") String liveUid);
 }

common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java

@@ -4,12 +4,9 @@ import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.alibaba.fastjson.JSONArray;
-import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.R;
 import com.yunbao.common.bean.ActiveModel;
-import com.yunbao.common.bean.AvatarBean;
 import com.yunbao.common.bean.BaseModel;
 import com.yunbao.common.bean.BattlePassPoints;
 import com.yunbao.common.bean.BattlePassTask;
@@ -69,7 +66,6 @@ import com.yunbao.common.bean.StarChallengeStatusModel;
 import com.yunbao.common.bean.SudGameUserModel;
 import com.yunbao.common.bean.SudRoomListModel;
 import com.yunbao.common.bean.SudgameCodeModel;
-import com.yunbao.common.bean.SwTokenModel;
 import com.yunbao.common.bean.UserAreaBean;
 import com.yunbao.common.bean.UserAvatarSelectBean;
 import com.yunbao.common.bean.VipModel;
@@ -83,7 +79,6 @@ import com.yunbao.common.http.base.CheckLiveCallBack;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.utils.WordUtil;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -93,10 +88,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
-import okhttp3.MediaType;
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
-import retrofit2.http.Query;
 
 
 /**
@@ -3142,6 +3133,7 @@ public class LiveNetManager {
                         }
                     }
                 }).isDisposed();
+
     }
 
     public void guardGetRewards(String guardLevel, String liveUid, HttpCallback<Object> callback) {
@@ -3168,147 +3160,6 @@ public class LiveNetManager {
 
     }
 
-    public void getSwToken( HttpCallback<SwTokenModel> callback) {
-        API.get().pdLiveApi(mContext)
-                .getSwToken()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<ResponseModel<SwTokenModel>>() {
-                    @Override
-                    public void accept(ResponseModel<SwTokenModel> listResponseModel) throws Exception {
-                        if (callback != null) {
-                            callback.onSuccess(listResponseModel.getData().getInfo());
-                        }
-                    }
-                }, new Consumer<Throwable>() {
-                    @Override
-                    public void accept(Throwable throwable) throws Exception {
-                        throwable.printStackTrace();
-                        if (callback != null) {
-                            callback.onError(mContext.getString(R.string.net_error));
-                        }
-                    }
-                }).isDisposed();
-
-    }
-
-    public void updateFile(File file, HttpCallback<AvatarBean> callback) {
-        MultipartBody.Part uploadFile = createUploadFile(file);
-        API.get().pdLiveApi(mContext)
-                .updateFile(uploadFile, CommonAppConfig.getInstance().getUid(), CommonAppConfig.getInstance().getToken())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<ResponseModel<AvatarBean>>() {
-                    @Override
-                    public void accept(ResponseModel<AvatarBean> model) throws Exception {
-                        if (callback != null) {
-                            callback.onSuccess(model.getData().getInfo());
-                        }
-                    }
-                }, new Consumer<Throwable>() {
-                    @Override
-                    public void accept(Throwable throwable) throws Exception {
-                        if (callback != null) {
-                            callback.onError(mContext.getString(com.yunbao.common.R.string.net_error));
-                        }
-                    }
-                }).isDisposed();
-    }
-
-    public void feedback(
-            String content,
-            JSONArray images,
-            String ci
-            , HttpCallback<HttpCallbackModel> callback) {
-        API.get().pdLiveApi(mContext)
-                .feedback(content, images.toString(), ci)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<ResponseModel<List<BaseModel>>>() {
-                    @Override
-                    public void accept(ResponseModel<List<BaseModel>> responseModel) {
-                        if (callback != null) {
-                            HttpCallbackModel model = new HttpCallbackModel();
-                            model.setCode(responseModel.getData().getCode());
-                            model.setMsg(responseModel.getData().getMsg());
-                            callback.onSuccess(model);
-                        }
-                    }
-                }, new Consumer<Throwable>() {
-                    @Override
-                    public void accept(Throwable throwable) throws Exception {
-                        if (callback != null) {
-                            callback.onError(mContext.getString(com.yunbao.common.R.string.net_error));
-                        }
-                    }
-                }).isDisposed();
-    }
-
-    public void checkFeedback(
-            HttpCallback<HttpCallbackModel> callback) {
-        API.get().pdLiveApi(mContext)
-                .checkFeedback()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<ResponseModel<List<BaseModel>>>() {
-                    @Override
-                    public void accept(ResponseModel<List<BaseModel>> responseModel) {
-                        if (callback != null) {
-                            HttpCallbackModel model = new HttpCallbackModel();
-                            model.setCode(responseModel.getData().getCode());
-                            model.setMsg(responseModel.getData().getMsg());
-                            callback.onSuccess(model);
-                        }
-                    }
-                }, new Consumer<Throwable>() {
-                    @Override
-                    public void accept(Throwable throwable) throws Exception {
-                        if (callback != null) {
-                            callback.onError(mContext.getString(com.yunbao.common.R.string.net_error));
-                        }
-                    }
-                }).isDisposed();
-    }
-
-    public void createGameOrder(
-            String roomId,
-            String cmd,
-            String value,
-            String gameId,
-            String fromUid,
-            String toUid,
-            String roundId,
-            String payload
-            , HttpCallback<HttpCallbackModel> callback) {
-        API.get().pdLiveApi(mContext)
-                .createGameOrder(roomId, cmd, value, gameId, fromUid, toUid,payload)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<ResponseModel<List<BaseModel>>>() {
-                    @Override
-                    public void accept(ResponseModel<List<BaseModel>> responseModel) {
-                        if (callback != null) {
-                            HttpCallbackModel model = new HttpCallbackModel();
-                            model.setCode(responseModel.getData().getCode());
-                            model.setMsg(responseModel.getData().getMsg());
-                            callback.onSuccess(model);
-                        }
-                    }
-                }, new Consumer<Throwable>() {
-                    @Override
-                    public void accept(Throwable throwable) throws Exception {
-                        if (callback != null) {
-                            callback.onError(mContext.getString(com.yunbao.common.R.string.net_error));
-                        }
-                    }
-                }).isDisposed();
-    }
-
-    private MultipartBody.Part createUploadFile(File file) {
-        RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
-        return MultipartBody.Part.createFormData("file", file.getName(), requestBody);
-    }
-
     /**
      * 直播间取消网络请求
      */

common/src/main/java/com/yunbao/common/http/main/MainNetManager.java

@@ -96,27 +96,27 @@ public class MainNetManager {
                 }).isDisposed();
     }
 
-//    /**
-//     * 猜你喜欢
-//     *
-//     * @param num 请求数量
-//     * @return
-//     */
-//    public void anchorRecommend(String num, String is_shengwang,HttpCallback<AnchorRecommendModel> httpCallback) {
-//        API.get().pdLiveApi(mContext).anchorRecommend(num,is_shengwang)
-//                .subscribeOn(Schedulers.io())
-//                .observeOn(AndroidSchedulers.mainThread())
-//                .subscribe(anchorRecommendModelResponseModel -> {
-//                    if (httpCallback != null) {
-//                        AnchorRecommendModel model = anchorRecommendModelResponseModel.getData().getInfo();
-//                        httpCallback.onSuccess(model);
-//                    }
-//                }, throwable -> {
-//                    if (httpCallback != null) {
-//                        httpCallback.onError(throwable.getMessage());
-//                    }
-//                }).isDisposed();
-//    }
+    /**
+     * 猜你喜欢
+     *
+     * @param num 请求数量
+     * @return
+     */
+    public void anchorRecommend(String num, HttpCallback<AnchorRecommendModel> httpCallback) {
+        API.get().pdLiveApi(mContext).anchorRecommend(num)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(anchorRecommendModelResponseModel -> {
+                    if (httpCallback != null) {
+                        AnchorRecommendModel model = anchorRecommendModelResponseModel.getData().getInfo();
+                        httpCallback.onSuccess(model);
+                    }
+                }, throwable -> {
+                    if (httpCallback != null) {
+                        httpCallback.onError(throwable.getMessage());
+                    }
+                }).isDisposed();
+    }
 
     public void anchorRecommend(Map<String, Object> map, HttpCallback<AnchorRecommendModel> httpCallback) {
         API.get().pdLiveApi(mContext).anchorRecommend(map)
@@ -140,12 +140,11 @@ public class MainNetManager {
      * @param num 请求数量
      * @return
      */
-    public void anchorRecommendType(String num, String is_shengwang,HttpCallback<AnchorRecommendModel> httpCallback) {
+    public void anchorRecommendType(String num, HttpCallback<AnchorRecommendModel> httpCallback) {
         Map<String, Object> map = new HashMap<>();
         map.put("num", num);
         map.put("live_recommend", "slide");
         map.put("type", "1");
-        map.put(" is_shengwang", is_shengwang);
         API.get().pdLiveApi(mContext).anchorRecommend(map)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

common/src/main/java/com/yunbao/common/interfaces/ImageResultCallback.java

@@ -1,62 +1,16 @@
 package com.yunbao.common.interfaces;
 
-import android.content.Context;
-
-import com.yunbao.common.CommonAppContext;
-import com.yunbao.common.bean.AvatarBean;
-import com.yunbao.common.http.live.LiveNetManager;
-import com.yunbao.common.upload.UploadBean;
-import com.yunbao.common.upload.UploadCallback;
-import com.yunbao.common.upload.UploadQnImpl;
-
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Created by cxf on 2018/9/29.
  */
 
-public abstract class ImageResultCallback {
+public interface ImageResultCallback {
     //跳转相机前执行
-    public void beforeCamera() {
-    }
+    void beforeCamera();
 
-    public void onSuccess(File file) {
-    }
+    void onSuccess(File file);
 
-    public void onFailure() {
-    }
-
-    public void onSuccessToUrl(File file, OnItemClickListener<String> listener) {
-        LiveNetManager.get(CommonAppContext.getTopActivity())
-                .updateFile(file, new com.yunbao.common.http.base.HttpCallback<AvatarBean>() {
-                    @Override
-                    public void onSuccess(AvatarBean data) {
-                        listener.onItemClick(data.getAvatar(), 0);
-                    }
-
-                    @Override
-                    public void onError(String error) {
-                        listener.onItemClick(error, -1);
-                    }
-                });
-    }
-
-    public void onSuccessToQiNiuUrl(Context mContext, File file, OnItemClickListener<String> listener) {
-        UploadQnImpl mUploadStrategy = new UploadQnImpl(mContext);
-        List<UploadBean> beans = new ArrayList<>();
-        beans.add(new UploadBean(file, UploadBean.IMG));
-        mUploadStrategy.upload(beans, true, new UploadCallback() {
-            @Override
-            public void onFinish(List<UploadBean> list, boolean success) {
-                if (success) {
-                    listener.onItemClick("https://downs.yaoulive.com/" + list.get(0).getRemoteAccessUrl(), 0);
-                } else {
-                    listener.onItemClick(null, -1);
-                }
-            }
-        }, true);
-
-    }
-}
+    void onFailure();
+}

common/src/main/java/com/yunbao/common/manager/IMLoginManager.java

@@ -8,15 +8,18 @@ import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.lzf.easyfloat.EasyFloat;
-import com.yunbao.common.utils.MobclickAgent;
+import com.lzy.okgo.model.Response;
+import com.umeng.analytics.MobclickAgent;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.event.DataUserInfoEvent;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.HttpClient;
+import com.yunbao.common.http.JsonBean;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.manager.base.BaseCacheManager;
 import com.yunbao.common.manager.imrongcloud.MessageIMManager;
@@ -465,6 +468,11 @@ public class IMLoginManager extends BaseCacheManager {
                             //兼容老模块(之后要把用户维护的类更换掉）
                             SpUtil.getInstance().setStringValue(SpUtil.USER_INFO, new Gson().toJson(userInfo));
                         }
+
+                        @Override
+                        public void onError(Response<JsonBean> response) {
+                            super.onError(response);
+                        }
                     });
 
         }

common/src/main/java/com/yunbao/common/manager/OpenAdManager.java

@@ -1,34 +1,25 @@
 package com.yunbao.common.manager;
 
-import android.app.Activity;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
-import com.lzf.easyfloat.enums.ShowPattern;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.bean.OpenAdModel;
-import com.yunbao.common.dialog.DebugDialog;
 import com.yunbao.common.dialog.OpenAdBottomDialogPopup;
 import com.yunbao.common.dialog.OpenAdCenterDialogPopup;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
-import com.yunbao.common.interfaces.OnItemClickListener;
-import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 public class OpenAdManager {
     public static final int TYPE_HOME = 1;
@@ -37,34 +28,19 @@ public class OpenAdManager {
     private Map<Integer, Boolean> showMap;
     private List<OpenAdModel> list = null;
     private Handler handler = new Handler(Looper.getMainLooper());
-    private Map<Integer, AdRunnable> runnableMap = new LinkedHashMap<>();
-    private Map<AdRunnable, Integer> waitRunnableMap = new LinkedHashMap<>();//等待运行的弹窗
+    private Map<Integer, AdRunnable> runnableMap = new HashMap<>();
     private int showType;
-    private WeakReference<AdRunnable> runNowRunnable;
-    private static final boolean IS_QUEUE_SHOW = true;//是否按队列显示弹窗，true就会等待上一个弹窗关闭后弹出，false就按原逻辑顺序直接弹出
 
     private OpenAdManager() {
         showMap = new HashMap<>();
         init(false);
     }
 
-    public void close() {
+    public void reset() {
         dismiss();
-        clear();
-    }
-
-    public void clear() {
         runnableMap.clear();
         showMap.clear();
         list.clear();
-        waitRunnableMap.clear();
-        list = null;
-        runNowRunnable = null;
-    }
-
-    public void reset() {
-        Log.i(TAG, "reset: ");
-        next();
     }
 
     private static final class MInstanceHolder {
@@ -79,14 +55,13 @@ public class OpenAdManager {
         if (list != null && list.isEmpty()) {
             return;
         }
-        Context context = AppManager.getInstance().getMainActivity();
+        Context context = CommonAppContext.getTopActivity();
         if (context == null) {
             context = CommonAppContext.sInstance;
         }
         if (context == null) {
             return;
         }
-
         LiveNetManager.get(context).activityPopup(new HttpCallback<List<OpenAdModel>>() {
             @Override
             public void onSuccess(List<OpenAdModel> data) {
@@ -95,64 +70,35 @@ public class OpenAdManager {
                     list = new ArrayList<>();
                     return;
                 }
-                Collections.sort(data, new AdListComparator());
                 list = data;
                 if (isShow) {
-                    if (showType == 0) {
-                        show(TYPE_HOME, false);
-                    } else {
-                        show(showType, false);
-                    }
+                    show(TYPE_HOME, false);
                 }
             }
 
             @Override
             public void onError(String error) {
-                Log.e(TAG, "弹框列表:" + error);
+                System.err.println("弹框列表:" + error);
             }
         });
     }
 
-    private static long showTime = 0;
-    private OnItemClickListener<String> onItemClickListener=new OnItemClickListener<String>() {
-        @Override
-        public void onItemClick(String bean, int position) {
-
-        }
-    };
-
+    private static long showTime=0;
     public synchronized void show(int type, boolean isGuard) {
-        showType = type;
         if (list == null) {
             init(true);
             return;
         }
-        Log.i(TAG, "show: 调用显示 " + type + " " + isGuard);
-        if (System.currentTimeMillis() - showTime < 100) {
+        if(System.currentTimeMillis()-showTime<100){
             return;
         }
-        /*DebugDialog.getInstance(new DebugDialog.DebugDialogRunnable() {
-            @Override
-            public void run(DebugDialog dialog) {
-                dialog.setShowPattern(ShowPattern.ALL_TIME);
-                dialog.show();
-                onItemClickListener = new OnItemClickListener<String>() {
-                    @Override
-                    public void onItemClick(String bean, int position) {
-                        dialog.setParams(bean, "剩余:" + position);
-                    }
-                };
-            }
-        });*/
-        showTime = System.currentTimeMillis();
-        waitRunnableMap.clear();
-        runnableMap.clear();
-        runNowRunnable = null;
+        showTime=System.currentTimeMillis();
+        showType = type;
         for (OpenAdModel model : list) {
             if (model.getType() == type) {
-               /* if (type == OpenAdModel.TYPE_LIVE && !model.userIsPermission(isGuard)) {
+                if (type == OpenAdModel.TYPE_LIVE && !model.userIsPermission(isGuard)) {
                     continue;
-                }*/
+                }
                 if (model.getShowModel() == OpenAdModel.SHOW_ONE) {
                     if (SpUtil.getInstance().getBooleanValue("open_ad_popup_" + model.getId())) {
                         continue;
@@ -176,22 +122,13 @@ public class OpenAdManager {
 
                 if (!isShow(model)) {
                     Log.i(TAG, "show: " + model);
-                    if (IS_QUEUE_SHOW) {
-                        waitRunnableMap.put(new AdRunnable(model), model.getDelayShowTime());
-                    } else {
-                        handler.postDelayed(new AdRunnable(model), model.getDelayShowTime());
-                    }
+                    handler.postDelayed(new AdRunnable(model), model.getDelayShowTime());
                 } else {
                     Log.i(TAG, "notshow: " + model);
                 }
 
             }
         }
-        Log.i(TAG, "show: 循环完毕，调用next");
-        if (IS_QUEUE_SHOW) {
-            onItemClickListener.onItemClick("接口返回需要展示的弹窗数:", waitRunnableMap.size());
-            next();
-        }
         Log.i(TAG, "------------------------------");
 
     }
@@ -207,9 +144,6 @@ public class OpenAdManager {
             }
         }
         runnableMap.clear();
-        if (runNowRunnable != null && runNowRunnable.get() != null) {
-            handler.removeCallbacks(runNowRunnable.get());
-        }
     }
 
     private synchronized boolean isShow(OpenAdModel type) {
@@ -219,45 +153,11 @@ public class OpenAdManager {
         return false;
     }
 
-    int getNowType() {
-        Activity lastActivity = AppManager.getInstance().getLastActivity();
-        if (lastActivity == null) {
-            return -1;
-        }
-        if (AppManager.getInstance().isLiveActivity()) {
-            return TYPE_LIVE;
-        } else if (AppManager.getInstance().isMainActivity()) {
-            return TYPE_HOME;
-        }
-        return -2;
-    }
-
-    void next() {
-        Log.i(TAG, "next: 剩余数" + waitRunnableMap.size());
-        if (waitRunnableMap.isEmpty()) return;
-        for (AdRunnable next : waitRunnableMap.keySet()) {
-            Log.i(TAG, "next: " + next.model);
-            if (next.model.getType() == getNowType()) {
-                Integer i = waitRunnableMap.get(next);
-                if (i == null) {
-                    i = 0;
-                }
-                onItemClickListener.onItemClick("当前加载id:" + next.model.getId() + " " + next.model.getName() + " 延迟展示时间:" + i, (waitRunnableMap.size() - 1));
-                handler.postDelayed(next, i);
-                return;
-            }
-        }
-
-    }
-
     private class AdRunnable implements Runnable {
         OpenAdModel model;
-        AdRunnable runnable;
 
         public AdRunnable(OpenAdModel model) {
             this.model = model;
-            this.runnable = this;
-            runNowRunnable = new WeakReference<>(this);
             runnableMap.put(model.getId(), this);
         }
 
@@ -270,100 +170,36 @@ public class OpenAdManager {
             Log.i(TAG, "run: " + model);
             if (model == null) {
                 ToastUtil.showDebug("model为空");
-                if (onItemClickListener != null) {
-                    onItemClickListener.onItemClick("", -2);
-                }
                 return;
             }
             if (!model.isInTime()) {
                 ToastUtil.showDebug("不在展示时间内：" + model.getStartTime() + "|" + model.getEndTime());
-                if (onItemClickListener != null) {
-                    onItemClickListener.onItemClick("", -2);
-                }
                 return;
             }
             if (isShow(model)) {
                 ToastUtil.showDebug(model.getId() + "|model展示过了");
-                if (onItemClickListener != null) {
-                    onItemClickListener.onItemClick("", -2);
-                }
                 return;
             }
             if (model.getType() != showType) {
-                if (onItemClickListener != null) {
-                    onItemClickListener.onItemClick("", -2);
-                }
                 return;
             }
-            if (isShow(model)) {
-                Log.i(TAG, "展示过：" + model);
-                if (onItemClickListener != null) {
-                    onItemClickListener.onItemClick("", -2);
-                }
+            if(isShow(model)){
+                Log.i(TAG,"展示过："+model);
                 return;
             }
-            if (model.getType() == OpenAdModel.TYPE_HOME && !AppManager.getInstance().isMainActivity()) {
-                Log.i(TAG, "首页类型弹窗，但当前不是首页");
-                if (onItemClickListener != null) {
-                    onItemClickListener.onItemClick("", -2);
-                }
-                dismiss();
-                return;
-            }
-            if (model.getType() == TYPE_LIVE && !AppManager.getInstance().isLiveActivity()) {
-                Log.i(TAG, "直播类型弹窗，但当前不是直播");
-                if (onItemClickListener != null) {
-                    onItemClickListener.onItemClick("", -2);
-                }
-                dismiss();
-                return;
-            }
-
             showMap.put(model.getId(), true);
             if (model.getShowModel() == OpenAdModel.SHOW_DIY) {
-                String nextTime = String.valueOf(System.currentTimeMillis() + (Long.parseLong(model.getSection()) * 60 * 1000));
+                String nextTime= String.valueOf(System.currentTimeMillis() + (Long.parseLong(model.getSection()) * 60 * 1000));
                 SpUtil.setStringValue("open_ad_popup_time_" + model.getId(), nextTime);
                 showMap.remove(model.getId());
             }
             if (model.getModel() == OpenAdModel.MODEL_BOTTOM) {
-                new OpenAdBottomDialogPopup(AppManager.getInstance().getLastActivity(), model).setListener((bean, position) -> {
-                    Log.i(TAG, "run: 弹框回调:" + position + " id = " + model.getId());
-                    if (IS_QUEUE_SHOW) {
-                        removeList(bean);
-                        if (position == 0) {
-                            next();
-                        }
-                    }
+                new OpenAdBottomDialogPopup(CommonAppContext.getTopActivity(), model).setListener((bean, position) -> {
                 }).showDialog();
             } else {
-                new OpenAdCenterDialogPopup(AppManager.getInstance().getLastActivity(), model).setListener((bean, position) -> {
-                    Log.i(TAG, "run: 弹框回调:" + position + " id = " + model.getId());
-                    if (IS_QUEUE_SHOW) {
-                        removeList(bean);
-                        if (position == 0) {
-                            next();
-                        }
-                    }
+                new OpenAdCenterDialogPopup(CommonAppContext.getTopActivity(), model).setListener((bean, position) -> {
                 }).showDialog();
             }
         }
-
-        void removeList(OpenAdModel model) {
-            Log.i(TAG, "removeList: " + model);
-            for (AdRunnable next : waitRunnableMap.keySet()) {
-                if (next.model.getId() == model.getId()) {
-                    waitRunnableMap.remove(next);
-                    return;
-                }
-            }
-        }
-    }
-
-    private class AdListComparator implements Comparator<OpenAdModel> {
-
-        @Override
-        public int compare(OpenAdModel openAdModel, OpenAdModel t1) {
-            return openAdModel.getSort() - t1.getSort();
-        }
     }
 }

common/src/main/java/com/yunbao/common/manager/RandomPkManager.java

@@ -343,7 +343,7 @@ public class RandomPkManager {
 
                     @Override
                     public void onError(String error) {
-                          //ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
+                          ToastUtil.show(WordUtil.isNewZh()?"抱歉！出錯了！":"i \\'m sorry! An error occurred");
                     }
                 });
     }