Merge branch 'master' into master_融云升级

# Conflicts: # config.gradle
修改问题
2024-04-15 13:08:27 +08:00 · 2024-04-12 14:14:16 +08:00 · 2024-04-11 16:32:21 +08:00 · 2024-04-10 13:31:40 +08:00 · 2024-04-10 10:31:21 +08:00 · 2024-04-10 09:51:28 +08:00
90 changed files with 578 additions and 421 deletions
--- a/FaceUnity/build.gradle
+++ b/FaceUnity/build.gradle
@@ -1,12 +1,18 @@
-apply plugin: 'com.android.library'
-apply plugin: 'img-optimizer'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+//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"
@@ -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 {
--- a/FaceUnity/src/main/AndroidManifest.xml
+++ b/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>

--- a/IAP6Helper/build.gradle
+++ b/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'])
 }
--- a/IAP6Helper/libs/samsung-iap-6.1.1.aar
+++ b/IAP6Helper/libs/samsung-iap-6.1.1.aar
--- a/IAP6Helper/src/main/AndroidManifest.xml
+++ b/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"/>

--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetOwnedListListener.java
+++ b/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);
-}
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetProductsDetailsListener.java
+++ b/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);
-}
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/AccountActivity.java
+++ b/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
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/BaseActivity.java
+++ b/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();
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/CheckPackageActivity.java
+++ b/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;
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/DialogActivity.java
+++ b/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.
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/PaymentActivity.java
+++ b/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);
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/dialog/BaseDialogFragment.java
+++ b/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;
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperDefine.java
+++ b/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.
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperListenerManager.java
+++ b/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.
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperUtil.java
+++ b/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.
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/IapHelper.java
+++ b/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,
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/BaseTask.java
+++ b/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.
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/ConsumePurchasedItemsTask.java
+++ b/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;

--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetOwnedListTask.java
+++ b/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;

--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetProductsDetailsTask.java
+++ b/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;

--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnConsumePurchasedItemsListener.java
+++ b/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 {
    /**
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetOwnedListListener.java
+++ b/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);
+}
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetProductsDetailsListener.java
+++ b/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);
+}
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnIapBindListener.java
+++ b/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.
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnPaymentListener.java
+++ b/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.
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnSucceedBind.java
+++ b/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.
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/BaseService.java
+++ b/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;
    }

--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ConsumePurchasedItems.java
+++ b/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);
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/OwnedProduct.java
+++ b/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);
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ProductsDetails.java
+++ b/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);
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/BaseVo.java
+++ b/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;

--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ConsumeVo.java
+++ b/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;

--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ErrorVo.java
+++ b/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;
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/OwnedProductVo.java
+++ b/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;

--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ProductVo.java
+++ b/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;
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/PurchaseVo.java
+++ b/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;

--- a/Share/build.gradle
+++ b/Share/build.gradle
@@ -1,12 +1,18 @@
-apply plugin: 'com.android.library'
-apply plugin: 'img-optimizer'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+//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"
@@ -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 {
--- a/Share/src/main/AndroidManifest.xml
+++ b/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"
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,11 +4,9 @@ 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 {
-
    }
    /*  applicationVariants.all { variant ->
          variant.mergeAssetsProvider.configure {
@@ -33,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"
@@ -105,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文件夹";
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -194,9 +194,12 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -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

--- a/app/src/main/AndroidManifest.xml
+++ b/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"
--- a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java
+++ b/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.
--- a/app/src/main/java/com/shayu/phonelive/utils/CustomMessageReceiver.java
+++ b/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 {

--- a/baidu/build.gradle
+++ b/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"
@@ -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 {
--- a/baidu/src/main/AndroidManifest.xml
+++ b/baidu/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.yunbao.baidu"
    />


--- a/beauty/build.gradle
+++ b/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"
@@ -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 {
--- a/beauty/src/main/AndroidManifest.xml
+++ b/beauty/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.yunbao.beauty"/>
+          />
--- a/build.gradle
+++ b/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
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'


 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
@@ -53,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 {
@@ -158,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'

@@ -213,18 +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'

-    implementation 'io.agora.rtc:full-sdk:4.3.0'
+
 }
--- a/common/libs/samsung-iap-6.1.1.aar
+++ b/common/libs/samsung-iap-6.1.1.aar
--- a/common/src/main/AndroidManifest.xml
+++ b/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"-->
--- a/common/src/main/java/com/yunbao/common/bean/UserBean.java
+++ b/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;
--- a/common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java
+++ b/common/src/main/java/com/yunbao/common/dialog/GuardBuyTipsDialog.java
@@ -73,10 +73,10 @@ public class GuardBuyTipsDialog {
                        buyTypeTextView.setVisibility(View.GONE);
                        content2.setVisibility(View.VISIBLE);

-                    } else if (guardType == mGuardUserInfoModel.getGuardType()) {
-                        content1.setVisibility(View.GONE);
-                    } else {
+                    } else if (TextUtils.equals(mGuardUserInfoModel.getIsOpen(), "1") && guardType > mGuardUserInfoModel.getGuardType()) {
                        content1.setVisibility(View.VISIBLE);
+                    } else {
+                        content1.setVisibility(View.GONE);
                    }
                } else {
                    content1.setVisibility(View.GONE);
--- a/common/src/main/java/com/yunbao/common/dialog/GuardUpgradePopup.java
+++ b/common/src/main/java/com/yunbao/common/dialog/GuardUpgradePopup.java
@@ -149,11 +149,11 @@ public class GuardUpgradePopup extends CenterPopupView {
                IMLoginModel userInfo = IMLoginManager.get(getContext()).getUserInfo();
                htmlUrl.append(CommonAppConfig.HOST)
                        .append("/h5/Guard/level.html?")
-                        .append("&token=")
+                        .append("token=")
                        .append(userInfo.getToken())
                        .append("&uid=")
                        .append(userInfo.getId())
-                        .append("&&anchorUid=")
+                        .append("&anchorUid=")
                        .append(mLiveUid)
                        .append("&isZh=")
                        .append(((WordUtil.isNewZh()) ? "1" : "0"));
--- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
+++ b/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.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);
+                        }
                    });

        }
--- a/common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java
+++ b/common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java
@@ -3,7 +3,7 @@ package com.yunbao.common.pay.samsung;
 import android.content.Context;

 import com.google.gson.Gson;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
+import com.samsung.android.sdk.iap.lib.constants.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.listener.OnGetOwnedListListener;
@@ -11,6 +11,8 @@ import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener;
 import com.samsung.android.sdk.iap.lib.vo.ConsumeVo;
 import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
 import com.samsung.android.sdk.iap.lib.vo.OwnedProductVo;
+import com.samsung.android.sdk.iap.lib.vo.PurchaseVo;
+import com.yunbao.common.R;
 import com.yunbao.common.utils.L;

 import java.util.ArrayList;
@@ -57,9 +59,27 @@ public class SamsungUtil {
     */
    public void buy(String skuId, OnPaymentListener onPaymentListener) {
        //购买
-        iapHelper.startPayment(skuId, "", onPaymentListener);
+        iapHelper.startPayment(skuId, "", (errorVo, purchaseVo) -> {
+            if (purchaseVo != null) {
+                onPaymentListener.onPaymentSuccess(purchaseVo.getPurchaseId());
+            } else {
+                if (errorVo.getErrorCode() == HelperDefine.IAP_PAYMENT_IS_CANCELED) {
+                    onPaymentListener.onPaymentFailed(mContext.getString(R.string.pay_cancel));
+                } else {
+                    onPaymentListener.onPaymentFailed(errorVo.getErrorString());
+                }
+            }
+
+        });
    }

+    public interface OnPaymentListener {
+        void onPaymentSuccess(String purchaseVo);
+
+        void onPaymentFailed(String errorVo);
+    }
+
+
    /**
     * 消耗指定商品
     *
--- a/common/src/main/java/com/yunbao/common/views/NewRoleFunGamesChildViewHolder.java
+++ b/common/src/main/java/com/yunbao/common/views/NewRoleFunGamesChildViewHolder.java
@@ -50,11 +50,14 @@ public class NewRoleFunGamesChildViewHolder extends RecyclerView.ViewHolder {
        }

        funGameName.setText(model.getTitle());
-        if (TextUtils.equals(model.getTitle(), WordUtil.getNewString(com.yunbao.common.R.string.guard_guard)) && IMLoginManager.get(itemView.getContext()).getGuardRedPoint()) {
-            total_image_red_point.setVisibility(View.VISIBLE);
-        } else {
-            total_image_red_point.setVisibility(View.GONE);
+        if (total_image_red_point!=null){
+            if (TextUtils.equals(model.getTitle(), WordUtil.getNewString(com.yunbao.common.R.string.guard_guard)) && IMLoginManager.get(itemView.getContext()).getGuardRedPoint()) {
+                total_image_red_point.setVisibility(View.VISIBLE);
+            } else {
+                total_image_red_point.setVisibility(View.GONE);
+            }
        }
+
        ViewClicksAntiShake.clicksAntiShake(itemView, new ViewClicksAntiShake.ViewClicksCallBack() {
            @Override
            public void onViewClicks() {
--- a/common/src/main/res/layout/view_live_buy_guard_slelect_item.xml
+++ b/common/src/main/res/layout/view_live_buy_guard_slelect_item.xml
@@ -10,10 +10,11 @@
    <TextView
        android:id="@+id/opening_time"
        android:layout_width="wrap_content"
+
        android:layout_height="wrap_content"
        android:layout_marginStart="19dp"
        android:layout_weight="1"
-        android:gravity="center"
+        android:gravity="start"
        android:text="@string/one_month"
        android:textColor="@color/white"
        android:textSize="14sp" />
--- a/common/src/main/res/values-en-rUS/string.xml
+++ b/common/src/main/res/values-en-rUS/string.xml
@@ -1466,7 +1466,7 @@ Limited ride And limited avatar frame</string>
    <string name="six_month">6 month</string>
    <string name="one_two_month">12 month</string>
    <string name="guardian_for_your_favorite_anchor">Quickly activate guardian for your favorite anchor！</string>
-    <string name="guardian_task">Guardian Task</string>
+    <string name="guardian_task">Guard tasks</string>
    <string name="my_graud_grade">My level ></string>
    <string name="no_one_guarding_the_anchor_yet">No one is guarding the anchor yet, come and guard it now~</string>
    <string name="this_week_contribution">Contribution/week</string>
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1469,7 +1469,7 @@ Limited ride And limited avatar frame</string>
    <string name="six_month">6 month</string>
    <string name="one_two_month">12 month</string>
    <string name="guardian_for_your_favorite_anchor">Quickly activate guardian for your favorite anchor！</string>
-    <string name="guardian_task">Guardian Task</string>
+    <string name="guardian_task">Guard tasks</string>
    <string name="my_graud_grade">My level ></string>
    <string name="no_one_guarding_the_anchor_yet">No one is guarding the anchor yet, come and guard it now~</string>
    <string name="this_week_contribution">Contribution/week</string>
--- a/config.gradle
+++ b/config.gradle
@@ -2,9 +2,9 @@ ext {
    android = [
            compileSdkVersion: 33,
            buildToolsVersion: "29.0.2",
-            minSdkVersion    : 21,
+            minSdkVersion    : 23,
            targetSdkVersion : 33,
-            versionCode      : 469,
+            versionCode      : 468,
            versionName      : "6.6.6"
    ]
    manifestPlaceholders = [
@@ -21,7 +21,7 @@ ext {
            baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",

 //            true表示谷歌支付 false    0 链接包   1 谷歌包   2华为包  3 samsung包
-            isGooglePlay     : 0,
+            isGooglePlay     : 3,
            //是否上报异常日志
            isUploadLog      : true,
            //是否打包成插件包模式
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -27,8 +27,8 @@ ext {
            "magicIndicator"       : 'com.github.hackware1993:MagicIndicator:1.6.0',//ViewPager指示器
            "banner"               : 'com.ms:banner:1.0.0',//轮播图
            "Luban"                : 'top.zibin:Luban:1.1.8',//鲁班压缩图片
-            "arouter"              : 'com.alibaba:arouter-api:1.5.2',//ARouter
-            "arouter-compiler"     : 'com.alibaba:arouter-compiler:1.2.2',
+            "arouter"              : 'com.github.jadepeakpoet.ARouter:arouter-api:1.0.3',//ARouter
+            "arouter-compiler"     : 'com.github.jadepeakpoet.ARouter:arouter-compiler:1.0.3',
            "leakcanary"       : 'com.squareup.leakcanary:leakcanary-android:2.9.1',
            "blank-utilcode"       : 'com.blankj:utilcode:1.30.0',

--- a/gradle.properties
+++ b/gradle.properties
@@ -13,13 +13,14 @@
 #Thu Feb 04 00:05:45 CST 2021
 android.injected.testOnly=false
 org.gradle.daemon=true 
-org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.configureondemand=true


 android.useAndroidX=true
 android.enableJetifier=true
+android.nonTransitiveRClass=false

 systemProp.http.proxyHost=127.0.0.1
 systemProp.https.proxyHost=127.0.0.1
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip

--- a/lib_country_code/build.gradle
+++ b/lib_country_code/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'


 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    namespace "com.sahooz.library"
+    compileSdk rootProject.ext.android.compileSdkVersion
    packagingOptions {
        pickFirst "lib/armeabi/libyuvutils.so"
        pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -25,10 +25,10 @@ android {
    }

    defaultConfig {
-        minSdkVersion minSdkVersion
-        targetSdkVersion targetSdkVersion
-        versionCode versionCode
-        versionName versionName
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
+        versionCode rootProject.ext.android.versionCode
+        versionName rootProject.ext.android.versionName
        manifestPlaceholders = rootProject.ext.manifestPlaceholders

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -42,8 +42,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
    }
 }

--- a/lib_country_code/src/main/AndroidManifest.xml
+++ b/lib_country_code/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

-    package="com.sahooz.library">
+   >

 </manifest>
--- a/lib_google/build.gradle
+++ b/lib_google/build.gradle
@@ -1,16 +1,16 @@
 apply plugin: 'com.android.library'

 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    namespace "com.shayu.lib_google"
+    compileSdk rootProject.ext.android.compileSdkVersion
    defaultConfig {
-        minSdkVersion minSdkVersion

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        consumerProguardFiles "consumer-rules.pro"
-        versionCode versionCode
-        versionName versionName
-        targetSdkVersion targetSdkVersion
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
+        versionCode rootProject.ext.android.versionCode
+        versionName rootProject.ext.android.versionName
    }

    buildTypes {
@@ -20,8 +20,8 @@ android {
        }
    }
    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
    }
 }

--- a/lib_google/src/main/AndroidManifest.xml
+++ b/lib_google/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.shayu.lib_google">
+   >

 </manifest>
--- a/lib_huawei/build.gradle
+++ b/lib_huawei/build.gradle
@@ -1,8 +1,9 @@
 apply plugin: 'com.android.library'

 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    namespace "com.shayu.lib_huawei"
+    compileSdk rootProject.ext.android.compileSdkVersion
+    targetSdk  rootProject.ext.android.buildToolsVersion
    defaultConfig {
        minSdkVersion minSdkVersion

@@ -20,8 +21,8 @@ android {
        }
    }
    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
    }
 }

--- a/lib_huawei/src/main/AndroidManifest.xml
+++ b/lib_huawei/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.shayu.lib_huawei">
+    >

 </manifest>
--- a/live/build.gradle
+++ b/live/build.gradle
@@ -1 +1 @@
-apply plugin: 'com.android.library'
+apply plugin: 'com.android.library'
--- a/live/src/main/AndroidManifest.xml
+++ b/live/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.yunbao.live">
+   >
    <!--com.kugou.fanxing.allinone.watch.liveroominone.media.FALiveRoomInOneActivity"-->
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.INTERNET" />
@@ -11,7 +11,7 @@

    <application
        android:allowBackup="true"
-
+        tools:replace="allowBackup"
        android:theme="@style/AppTheme">
        <activity android:name=".activity.LiveTRTCAnchorActivity" />
        <activity
--- a/live/src/main/java/com/yunbao/live/activity/LiveActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveActivity.java
@@ -506,7 +506,7 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
            mLiveRoomViewHolder.onGuardInfoChanged(bean);
            LiveChatBean chatBean = new LiveChatBean();
            chatBean.setContent(bean.getUserName());
-            chatBean.setType(LiveChatBean.SYSTEM);
+            chatBean.setType(LiveChatBean.SYSTEM2);
            mLiveRoomViewHolder.insertChat(chatBean, 1);
        }
    }
@@ -1267,7 +1267,13 @@ public abstract class LiveActivity extends AbsActivity implements SocketMessageL
        if (uid == null) {
            uid = mLiveUid;
        }
-        MobclickAgent.onEvent(mContext, "guardian_people", "守护席点击次数及人数");
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                MobclickAgent.onEvent(mContext, "guardian_people", "守护席点击次数及人数");
+            }
+        }, 500);
+
        LiveHttpUtil.getGuardList(uid, 1, new HttpCallback() {
            @Override
            public void onSuccess(int code, String msg, String[] info) {
--- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
@@ -220,27 +220,27 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
        Bus.getOn(this);
        Intent intent = getIntent();
        initFaceManager();
-//        RCRTCEngine.getInstance().registerStatusReportListener(new IRCRTCStatusReportListener() {
-//
-//            @Override
-//            public void onConnectionStats(StatusReport statusReport) {
-//                //视频发送信息
-//                for (Map.Entry<String, StatusBean> entry : statusReport.statusVideoSends.entrySet()) {
-//                    StatusBean statusBean = entry.getValue();
-//                    //获取userID
-//                    String userId = statusBean.uid;
-//                    //获取视频 宽x高@帧率
-//                    String resolution = statusBean.frameWidth + "x" + statusBean.frameHeight + "@" + statusBean.frameRate;
-//                    //获取码率
-//                    long bitRate = statusBean.bitRate;
-//                    //丢包率
-//                    long lossRate = statusBean.packetLostRate;
-//                    //带宽
+        RCRTCEngine.getInstance().registerStatusReportListener(new IRCRTCStatusReportListener() {
+
+            @Override
+            public void onConnectionStats(StatusReport statusReport) {
+                //视频发送信息
+                for (Map.Entry<String, StatusBean> entry : statusReport.statusVideoSends.entrySet()) {
+                    StatusBean statusBean = entry.getValue();
+                    //获取userID
+                    String userId = statusBean.uid;
+                    //获取视频 宽x高@帧率
+                    String resolution = statusBean.frameWidth + "x" + statusBean.frameHeight + "@" + statusBean.frameRate;
+                    //获取码率
+                    long bitRate = statusBean.bitRate;
+                    //丢包率
+                    long lossRate = statusBean.packetLostRate;
+                    //带宽
 //                    String googAvailableSendBandwidth = statusReport.googAvailableSendBandwidth;
-////                    Log.e("网速和内存", "获取视频：" + resolution + "    丢包率：" + lossRate + "     带宽：" + googAvailableSendBandwidth);
-//                }
-//            }
-//        });
+//                    Log.e("网速和内存", "获取视频：" + resolution + "    丢包率：" + lossRate + "     带宽：" + googAvailableSendBandwidth);
+                }
+            }
+        });
        leave_img = findViewById(R.id.leave_img);
        mLiveSDK = intent.getIntExtra(Constants.LIVE_SDK, Constants.LIVE_SDK_KSY);
        mLiveKsyConfigBean = intent.getParcelableExtra(Constants.LIVE_KSY_CONFIG);
--- a/live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java
+++ b/live/src/main/java/com/yunbao/live/dialog/LiveGuardDialog.java
@@ -291,11 +291,11 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
                IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
                htmlUrl.append(CommonAppConfig.HOST)
                        .append("/h5/Guard/mission.html?")
-                        .append("&token=")
+                        .append("token=")
                        .append(userInfo.getToken())
                        .append("&uid=")
                        .append(userInfo.getId())
-                        .append("&&anchorUid=")
+                        .append("&anchorUid=")
                        .append(mLiveUid)
                        .append("&isZh=")
                        .append(((WordUtil.isNewZh()) ? "1" : "0"));
@@ -317,11 +317,11 @@ public class LiveGuardDialog extends AbsDialogPopupWindow {
                IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
                htmlUrl.append(CommonAppConfig.HOST)
                        .append("/h5/Guard/level.html?")
-                        .append("&token=")
+                        .append("token=")
                        .append(userInfo.getToken())
                        .append("&uid=")
                        .append(userInfo.getId())
-                        .append("&&anchorUid=")
+                        .append("&anchorUid=")
                        .append(mLiveUid)
                        .append("&isZh=")
                        .append(((WordUtil.isNewZh()) ? "1" : "0"));
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1686,6 +1686,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                    RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
                    layoutParams.topMargin = DpUtil.dp2px(110);
                    dragonImmediateParticipation.setLayoutParams(layoutParams);
+                } if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE) {
+                    RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
+                    layoutParams.topMargin = DpUtil.dp2px(110);
+                    dragonImmediateParticipationTime.setLayoutParams(layoutParams);
                }
                anchorTimeHandler.removeCallbacks(anchorTimeRunnable);
                LiveNetManager.get(mContext).
@@ -1718,6 +1722,20 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                layoutParams.topMargin = DpUtil.dp2px(190);
                dragonImmediateParticipation.setLayoutParams(layoutParams);
            }
+            if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE&&mContext instanceof LiveRyAnchorActivity) {
+                RelativeLayout.LayoutParams layoutParamsredPacket = (RelativeLayout.LayoutParams) redPacket.getLayoutParams();
+                layoutParamsredPacket.topMargin = DpUtil.dp2px(110);
+                redPacket.setLayoutParams(layoutParamsredPacket);
+
+                RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipationTime.getLayoutParams();
+                layoutParams.topMargin = DpUtil.dp2px(190);
+                dragonImmediateParticipationTime.setLayoutParams(layoutParams);
+            }
+            if (dragonImmediateParticipationTime.getVisibility() == View.GONE&&mContext instanceof LiveRyAnchorActivity){
+                RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) redPacket.getLayoutParams();
+                layoutParams.topMargin = DpUtil.dp2px(110);
+                redPacket.setLayoutParams(layoutParams);
+            }
            if (redPacketModel.getCountdown() > 180) {
                redPacketQueue.setVisibility(View.GONE);
                redPacketCountdown.setVisibility(View.VISIBLE);
@@ -1794,6 +1812,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
            layoutParams.topMargin = DpUtil.dp2px(110);
            dragonImmediateParticipation.setLayoutParams(layoutParams);
        }
+        if (dragonImmediateParticipationTime.getVisibility() == View.VISIBLE) {
+            RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipationTime.getLayoutParams();
+            layoutParams.topMargin = DpUtil.dp2px(110);
+            dragonImmediateParticipationTime.setLayoutParams(layoutParams);
+        }
    }

    public void setRedPacketInfoModel(RedPacketInfoModel redPacket) {
@@ -3196,6 +3219,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
            sendMoneyTime = Long.parseLong(sendMoneyLongModel.getCountdown());
            participation_time.removeCallbacks(sendMoneyRunnable);
            dragonImmediateParticipationTime.setVisibility(View.VISIBLE);
+            if (redPacket.getVisibility() == View.VISIBLE) {
+                RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
+                layoutParams.topMargin = DpUtil.dp2px(190);
+                dragonImmediateParticipationTime.setLayoutParams(layoutParams);
+            } else {
+                RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
+                layoutParams.topMargin = DpUtil.dp2px(110);
+                dragonImmediateParticipationTime.setLayoutParams(layoutParams);
+            }
            String s1 = StringUtil.getDurationText(sendMoneyTime * 1000);
            participation_time.setText(s1);
            participation_time.post(sendMoneyRunnable);
@@ -3217,6 +3249,15 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
    public void onSendMoneyLongEndEvent(SendMoneyLongEndEvent moneyLongEndEvent) {
        if (mLiveUid.contains(String.valueOf(IMLoginManager.get(mContext).getUserInfo().getId()))) {
            dragonImmediateParticipationTime.setVisibility(View.GONE);
+            if (redPacket.getVisibility() == View.VISIBLE) {
+                RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
+                layoutParams.topMargin = DpUtil.dp2px(190);
+                dragonImmediateParticipationTime.setLayoutParams(layoutParams);
+            } else {
+                RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) dragonImmediateParticipation.getLayoutParams();
+                layoutParams.topMargin = DpUtil.dp2px(110);
+                dragonImmediateParticipationTime.setLayoutParams(layoutParams);
+            }
        } else {
            dragonImmediateParticipation.setVisibility(View.GONE);

--- a/main/build.gradle
+++ b/main/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'img-optimizer'

 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    namespace "com.yunbao.main"
+    compileSdk rootProject.ext.android.compileSdkVersion
    packagingOptions {
        pickFirst "lib/armeabi/libyuvutils.so"
        pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -53,8 +53,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
    }
 }
 repositories {
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yunbao.main">
+    >

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <application
-        android:allowBackup="true"
        android:theme="@style/AppTheme">
-        <activity
-            android:name=".MsgSettActivity"
-            android:exported="false" />
        <activity android:name=".activity.OneLoginActivity" />
        <activity
            android:name=".activity.WeekWebViewActivity"
--- a/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java
+++ b/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java
@@ -1,8 +1,6 @@
 package com.yunbao.main.activity;


-import static com.yunbao.main.activity.MyWalletActivity.dis;
-
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.os.Handler;
@@ -16,13 +14,6 @@ import android.webkit.WebView;

 import androidx.fragment.app.Fragment;

-import com.facebook.appevents.AppEventsConstants;
-import com.samsung.android.sdk.iap.lib.helper.HelperDefine;
-import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener;
-import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
-import com.samsung.android.sdk.iap.lib.vo.PurchaseVo;
-import com.yunbao.common.http.CommonHttpUtil;
-import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.pay.samsung.SamsungUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
@@ -104,41 +95,38 @@ public class SamsungFragment extends Fragment {
                mProductId = ProductId;
                mOrderid = OrderNumber;
                MoneyUsds = MoneyUsd;
-
-                SamsungUtil.newInstance(getActivity()).buy(mProductId, new OnPaymentListener() {
+                SamsungUtil.newInstance(getActivity()).buy(mProductId, new SamsungUtil.OnPaymentListener() {
                    @Override
-                    public void onPayment(ErrorVo _errorVO, PurchaseVo _purchaseVO) {
-                        if (_purchaseVO != null) {
-                            SamsungUtil.newInstance(getActivity()).consume(_purchaseVO.getPurchaseId());
-                            payHandler.post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    CommonHttpUtil.notifySamsung(_purchaseVO.getPurchaseId(), mOrderid, new HttpCallback() {
-                                        @Override
-                                        public void onSuccess(int code, String msg, String[] info) {
-                                            if (code == 0) {
-                                                ToastUtil.show(getString(R.string.pay_suc));
-                                                dis();
-                                            }
-                                        }
-                                    });
-                                }
-                            });
-                        } else {
-                            payHandler.post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    if (_errorVO.getErrorCode() == HelperDefine.IAP_PAYMENT_IS_CANCELED) {
-                                        ToastUtil.show(getString(R.string.pay_cancel));
-                                    } else {
-                                        ToastUtil.show(_errorVO.getErrorString());
-                                    }
-                                }
-                            });
-                        }
+                    public void onPaymentSuccess(String purchaseVo) {
+                        SamsungUtil.newInstance(getActivity()).consume(purchaseVo);
+                        payHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+//                                    CommonHttpUtil.notifySamsung(_purchaseVO.getPurchaseId(), mOrderid, new HttpCallback() {
+//                                        @Override
+//                                        public void onSuccess(int code, String msg, String[] info) {
+//                                            if (code == 0) {
+//                                                ToastUtil.show(getString(R.string.pay_suc));
+//                                                dis();
+//                                            }
+//                                        }
+//                                    });
+                            }
+                        });
+                    }
+
+                    @Override
+                    public void onPaymentFailed(String errorVo) {
+                        payHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                ToastUtil.show(errorVo);
+                            }
+                        });
                    }
                });
            }
+
            lastClickTime = currentTime;

            Log.e(TAG, "ProductId" + ProductId + "OrderNumber" + OrderNumber + "MoneyUsd" + MoneyUsd);
@@ -154,6 +142,7 @@ public class SamsungFragment extends Fragment {
        public void androidGoBack() {
            getActivity().onBackPressed();
        }
+
    }


--- a/main/src/main/java/com/yunbao/main/adapter/MainHomeFollowAdapter.java
+++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeFollowAdapter.java
@@ -7,11 +7,13 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;

 import com.yunbao.common.Constants;
 import com.yunbao.common.adapter.RefreshAdapter;
 import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.utils.DpUtil;
 import com.yunbao.main.R;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.main.utils.MainIconUtil;
@@ -64,6 +66,7 @@ public class MainHomeFollowAdapter extends RefreshAdapter<LiveBean> {
        TextView mTitle;
        TextView mNum;
        ImageView mType;
+        private View redPacket, dragon_money;

        public Vh(View itemView) {
            super(itemView);
@@ -73,6 +76,8 @@ public class MainHomeFollowAdapter extends RefreshAdapter<LiveBean> {
            mTitle = (TextView) itemView.findViewById(R.id.title);
            mNum = (TextView) itemView.findViewById(R.id.num);
            mType = (ImageView) itemView.findViewById(R.id.type);
+            redPacket = itemView.findViewById(R.id.red_packet);
+            dragon_money = itemView.findViewById(R.id.dragon_money);
            itemView.setOnClickListener(mOnClickListener);
        }

@@ -101,6 +106,21 @@ public class MainHomeFollowAdapter extends RefreshAdapter<LiveBean> {
                mType.setImageResource(MainIconUtil.getLiveTypeIcon(Constants.LIVE_TYPE_RESTING));
            }
 //            mType.setImageResource(MainIconUtil.getLiveTypeIcon(bean.getType()));
+            RelativeLayout.LayoutParams dragon_moneyLayoutParams = (RelativeLayout.LayoutParams) dragon_money.getLayoutParams();
+            if (bean.getRedPacketStatus() == 1) {
+                dragon_moneyLayoutParams.topMargin = DpUtil.dp2px(55);
+                redPacket.setVisibility(View.VISIBLE);
+            } else {
+                dragon_moneyLayoutParams.topMargin = DpUtil.dp2px(25);
+                redPacket.setVisibility(View.GONE);
+
+            }
+            if (bean.getSendMoneyLongStatus() == 1) {
+                dragon_money.setLayoutParams(dragon_moneyLayoutParams);
+                dragon_money.setVisibility(View.VISIBLE);
+            } else {
+                dragon_money.setVisibility(View.GONE);
+            }
        }
    }

--- a/main/src/main/java/com/yunbao/main/adapter/MainHomeRemFollLiveAdapter.java
+++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeRemFollLiveAdapter.java
@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;

 import androidx.annotation.NonNull;
@@ -19,6 +20,7 @@ import com.yunbao.common.Constants;
 import com.yunbao.common.adapter.RefreshAdapter;
 import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.formatBigNum;
 import com.yunbao.main.R;
 import com.yunbao.main.utils.MainIconUtil;
@@ -79,11 +81,12 @@ public class MainHomeRemFollLiveAdapter extends RefreshAdapter<LiveBean> {
        ImageView dr_pk_ico;
        View views;
        ImageView bgs;
-        private View redPacket;
+        private View redPacket, dragon_money;

        public Vh(View itemView) {
            super(itemView);
            redPacket = itemView.findViewById(R.id.red_packet);
+            dragon_money = itemView.findViewById(R.id.dragon_money);
            live_info_view = (LinearLayout) itemView.findViewById(R.id.live_info_view);
            mCover = (ImageView) itemView.findViewById(R.id.cover);
            mName = (TextView) itemView.findViewById(R.id.name);
@@ -222,10 +225,20 @@ public class MainHomeRemFollLiveAdapter extends RefreshAdapter<LiveBean> {
            if (bean.getIs_week() != null && bean.getIs_week().equals("1")) {
                views.setVisibility(View.GONE);
            }
+            RelativeLayout.LayoutParams dragon_moneyLayoutParams = (RelativeLayout.LayoutParams) dragon_money.getLayoutParams();
            if (bean.getRedPacketStatus() == 1) {
+                dragon_moneyLayoutParams.topMargin = DpUtil.dp2px(55);
                redPacket.setVisibility(View.VISIBLE);
            } else {
+                dragon_moneyLayoutParams.topMargin = DpUtil.dp2px(25);
                redPacket.setVisibility(View.GONE);
+
+            }
+            if (bean.getSendMoneyLongStatus() == 1) {
+                dragon_money.setLayoutParams(dragon_moneyLayoutParams);
+                dragon_money.setVisibility(View.VISIBLE);
+            } else {
+                dragon_money.setVisibility(View.GONE);
            }

        }
--- a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
+++ b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
@@ -307,7 +307,13 @@ public class MainHttpUtil {
    public static void getBaseInfo(CommonCallback<UserBean> commonCallback) {
        getBaseInfo(CommonAppConfig.getInstance().getUid(),
                CommonAppConfig.getInstance().getToken(),
-                commonCallback);
+                new CommonCallback<UserBean>() {
+                    @Override
+                    public void callback(UserBean bean) {
+                        CommonAppConfig.getInstance().setUserBean(bean);
+                        commonCallback.callback(bean);
+                    }
+                });
    }

    /**
--- a/main/src/main/res/layout/item_main_home_follow.xml
+++ b/main/src/main/res/layout/item_main_home_follow.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.yunbao.common.custom.MyRelativeLayout5
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.yunbao.common.custom.MyRelativeLayout5 xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="0dp"
-    android:layout_marginTop="5dp"
-    >
+    android:layout_marginTop="5dp">

    <com.makeramen.roundedimageview.RoundedImageView
        android:id="@+id/cover"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:scaleType="centerCrop"
-        app:riv_corner_radius="5dp"
-        />
+        app:riv_corner_radius="5dp" />

    <com.yunbao.common.custom.RatioRoundImageView
        android:layout_width="match_parent"
@@ -22,30 +20,28 @@
        android:src="@mipmap/bg_main_item_bottom"
        app:ri_ratio="0.5"
        app:riv_corner_radius_bottom_left="5dp"
-        app:riv_corner_radius_bottom_right="5dp"
-        />
+        app:riv_corner_radius_bottom_right="5dp" />

    <com.makeramen.roundedimageview.RoundedImageView
        android:id="@+id/avatar"
        android:layout_width="30dp"
        android:layout_height="30dp"
        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="6dp"
        android:layout_marginLeft="10dp"
-        android:layout_marginRight="8dp"
        android:layout_marginTop="6dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginBottom="6dp"
        android:scaleType="centerCrop"
-        app:riv_oval="true"
-        />
+        app:riv_oval="true" />

    <com.yunbao.common.custom.DrawableTextView
        android:id="@+id/num"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
        android:layout_alignTop="@id/avatar"
-        android:layout_marginRight="10dp"
+        android:layout_alignParentRight="true"
        android:layout_marginTop="7dp"
+        android:layout_marginRight="10dp"
        android:drawablePadding="4dp"
        android:gravity="center"
        android:singleLine="true"
@@ -53,8 +49,7 @@
        android:textSize="13sp"
        app:dt_left_drawable="@mipmap/icon_main_live_num"
        app:dt_left_height="14dp"
-        app:dt_left_width="14dp"
-        />
+        app:dt_left_width="14dp" />


    <TextView
@@ -62,15 +57,14 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_alignTop="@id/avatar"
-        android:layout_marginRight="10dp"
        android:layout_marginTop="6dp"
+        android:layout_marginRight="10dp"
        android:layout_toLeftOf="@id/num"
        android:layout_toRightOf="@id/avatar"
        android:ellipsize="end"
        android:singleLine="true"
        android:textColor="#fff"
-        android:textSize="14sp"
-        />
+        android:textSize="14sp" />

    <TextView
        android:id="@+id/title"
@@ -78,15 +72,14 @@
        android:layout_height="wrap_content"
        android:layout_above="@id/avatar"
        android:layout_marginLeft="10dp"
-        android:layout_marginRight="20dp"
        android:layout_marginTop="5dp"
+        android:layout_marginRight="20dp"
        android:ellipsize="end"
        android:includeFontPadding="false"
        android:maxLines="2"
        android:textColor="#fff"
        android:textSize="14sp"
-        android:textStyle="bold"
-        />
+        android:textStyle="bold" />

    <ImageView
        android:id="@+id/type"
@@ -94,7 +87,29 @@
        android:layout_height="16dp"
        android:layout_above="@id/title"
        android:layout_marginLeft="10dp"
-        android:scaleType="fitXY"
-        />
+        android:scaleType="fitXY" />

+    <ImageView
+        android:id="@+id/dragon_money"
+        android:layout_width="25dp"
+        android:layout_height="30dp"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="25dp"
+        android:layout_marginTop="55dp"
+        android:visibility="gone"
+        app:srcCompat="@mipmap/icon_live_dragon_money"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/red_packet"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="25dp"
+        android:visibility="gone"
+        app:srcCompat="@mipmap/icon_red_packet"
+        tools:visibility="visible" />
 </com.yunbao.common.custom.MyRelativeLayout5>
--- a/main/src/main/res/layout/view_main_home.xml
+++ b/main/src/main/res/layout/view_main_home.xml
@@ -51,8 +51,8 @@
                        android:paddingTop="1dp"
                        android:text="@string/main_type_theater"
                        android:textColor="#B1B1B1"
-                        android:layout_marginBottom="3dp"
-                        android:textSize="16dp"
+                        android:layout_marginBottom="2dp"
+                        android:textSize="17dp"
                        android:textStyle="bold" />

                </LinearLayout>
--- a/pluginsForAnchor/build.gradle
+++ b/pluginsForAnchor/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'com.android.application'


 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    namespace "com.pdlive.plugins"
+    compileSdk rootProject.ext.android.compileSdkVersion
    packagingOptions {
        pickFirst "lib/armeabi/libyuvutils.so"
        pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -134,8 +134,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
    }
    sourceSets {
        main {
--- a/pluginsForAnchor/src/main/AndroidManifest.xml
+++ b/pluginsForAnchor/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?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.plugins"
    >

    <application
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,4 +6,4 @@ include ':Share'
 include ':pluginsForAnchor'
 //include ':lib_huawei'
 include ':lib_google'
-include ':IAP6Helper'
+//include ':IAP6Helper'
--- a/video/build.gradle
+++ b/video/build.gradle
@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'


 android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
+    namespace "com.yunbao.video"
+    compileSdk rootProject.ext.android.compileSdkVersion
    packagingOptions {
        pickFirst "lib/armeabi/libyuvutils.so"
        pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -46,8 +46,8 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_18
+        targetCompatibility JavaVersion.VERSION_18
    }
 }
 repositories {
--- a/video/src/main/AndroidManifest.xml
+++ b/video/src/main/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.yunbao.video"
-    >
+    xmlns:tools="http://schemas.android.com/tools">
    <application
        android:allowBackup="true"
        android:theme="@style/AppTheme"
+        tools:replace="allowBackup"
        >
        <activity
            android:name="com.yunbao.video.activity.VideoPlayActivity"
Author	SHA1	Message	Date
18401019693	5c0b126072	Merge branch 'master' into master_融云升级 # Conflicts: # config.gradle	2024-04-15 13:08:27 +08:00
18401019693	11ba2c45f8	修改问题	2024-04-12 14:14:16 +08:00
18401019693	320584769d	修改问题	2024-04-11 16:32:21 +08:00
18401019693	b29b0a1688	修改问题	2024-04-10 13:31:40 +08:00
18401019693	f88356cea2	修改问题	2024-04-10 10:31:21 +08:00
18401019693	2a67cf7228	修改问题	2024-04-10 09:51:28 +08:00
18401019693	a100ab1a4a	修改问题	2024-04-09 13:04:42 +08:00
18401019693	69b45f1d21	修改问题	2024-04-08 14:43:27 +08:00
18401019693	479a743d29	替换声网的RTC库	2024-04-08 14:04:15 +08:00
18401019693	8cf6271dc3	融云升级	2024-03-27 13:41:53 +08:00
18401019693	0be4e3440c	升级备份	2024-03-27 11:11:32 +08:00