diff --git a/IAP6Helper/src/main/AndroidManifest.xml b/IAP6Helper/src/main/AndroidManifest.xml
index 15497edba..7f20d0919 100644
--- a/IAP6Helper/src/main/AndroidManifest.xml
+++ b/IAP6Helper/src/main/AndroidManifest.xml
@@ -10,22 +10,22 @@
         <!-- 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"/>
 
diff --git 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
deleted file mode 100644
index 35d76f957..000000000
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetOwnedListListener.java
+++ /dev/null
@@ -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);
-}
diff --git 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
deleted file mode 100644
index 55442b181..000000000
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetProductsDetailsListener.java
+++ /dev/null
@@ -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);
-}
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/AccountActivity.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/AccountActivity.java
similarity index 91%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/AccountActivity.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/AccountActivity.java
index 4ce2f87a2..417637248 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/BaseActivity.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/BaseActivity.java
similarity index 85%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/BaseActivity.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/BaseActivity.java
index 10e581604..1e186d0a1 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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();
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/CheckPackageActivity.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/CheckPackageActivity.java
similarity index 77%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/CheckPackageActivity.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/CheckPackageActivity.java
index e790a63d0..5455b5663 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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;
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/DialogActivity.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/DialogActivity.java
similarity index 78%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/DialogActivity.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/DialogActivity.java
index 8e77cfa79..d4b2fd427 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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.
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/PaymentActivity.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/PaymentActivity.java
similarity index 92%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/PaymentActivity.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/PaymentActivity.java
index e309aa00c..786c01b94 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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);
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/dialog/BaseDialogFragment.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/dialog/BaseDialogFragment.java
similarity index 99%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/dialog/BaseDialogFragment.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/dialog/BaseDialogFragment.java
index 8f2977cd3..cc0b0272e 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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;
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperDefine.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperDefine.java
similarity index 99%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperDefine.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperDefine.java
index 15a86549d..fc5ce9330 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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.
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperListenerManager.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperListenerManager.java
similarity index 83%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperListenerManager.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperListenerManager.java
index f4a827f65..c44040c09 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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.
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperUtil.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperUtil.java
similarity index 98%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperUtil.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperUtil.java
index 265ff6f50..b68f19658 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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.
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/IapHelper.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/IapHelper.java
similarity index 92%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/IapHelper.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/IapHelper.java
index 7e5ad8a55..319d25159 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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,
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/BaseTask.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/BaseTask.java
similarity index 88%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/BaseTask.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/BaseTask.java
index c284cef37..b5590d07b 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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.
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/ConsumePurchasedItemsTask.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/ConsumePurchasedItemsTask.java
similarity index 94%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/ConsumePurchasedItemsTask.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/ConsumePurchasedItemsTask.java
index 95b7776be..71cf83158 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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;
 
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/GetOwnedListTask.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetOwnedListTask.java
similarity index 95%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/GetOwnedListTask.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetOwnedListTask.java
index a52b7d21d..2f7cf13d9 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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;
 
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/GetProductsDetailsTask.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetProductsDetailsTask.java
similarity index 95%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/GetProductsDetailsTask.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetProductsDetailsTask.java
index 65002d7b0..b93c0f43c 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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;
 
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnConsumePurchasedItemsListener.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnConsumePurchasedItemsListener.java
similarity index 50%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnConsumePurchasedItemsListener.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnConsumePurchasedItemsListener.java
index 4311cde1b..bdb56da83 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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 {
     /**
diff --git 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
new file mode 100644
index 000000000..4cee2b6f6
--- /dev/null
+++ 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);
+}
diff --git 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
new file mode 100644
index 000000000..c837fdda8
--- /dev/null
+++ 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);
+}
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnIapBindListener.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnIapBindListener.java
similarity index 85%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnIapBindListener.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnIapBindListener.java
index ff6ca117c..3e0bd63ea 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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.
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnPaymentListener.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnPaymentListener.java
similarity index 69%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnPaymentListener.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnPaymentListener.java
index 00a098365..46ad85018 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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.
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnSucceedBind.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnSucceedBind.java
similarity index 63%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnSucceedBind.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnSucceedBind.java
index 3db6ffc21..ad360d795 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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.
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/BaseService.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/BaseService.java
similarity index 78%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/BaseService.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/BaseService.java
index d6b03eb1e..b9ee6f84b 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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;
     }
 
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/ConsumePurchasedItems.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ConsumePurchasedItems.java
similarity index 76%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/ConsumePurchasedItems.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ConsumePurchasedItems.java
index 3766b4a25..b50d1c225 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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);
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/OwnedProduct.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/OwnedProduct.java
similarity index 76%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/OwnedProduct.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/OwnedProduct.java
index ac3dd40f0..4b4a2ed7e 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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);
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/ProductsDetails.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ProductsDetails.java
similarity index 76%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/ProductsDetails.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ProductsDetails.java
index e0f736910..71b60d348 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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);
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/BaseVo.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/BaseVo.java
similarity index 98%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/BaseVo.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/BaseVo.java
index 76c8f39c2..999d98245 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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;
 
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ConsumeVo.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ConsumeVo.java
similarity index 97%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ConsumeVo.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ConsumeVo.java
index 87fef9461..540b36dc8 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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;
 
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ErrorVo.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ErrorVo.java
similarity index 93%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ErrorVo.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ErrorVo.java
index 8f691fe2d..51e0b907e 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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;
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/OwnedProductVo.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/OwnedProductVo.java
similarity index 98%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/OwnedProductVo.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/OwnedProductVo.java
index 9bb1c9c4e..17ad2d51a 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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;
 
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ProductVo.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ProductVo.java
similarity index 99%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ProductVo.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ProductVo.java
index 635056069..3a6ab6d2a 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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;
diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/PurchaseVo.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/PurchaseVo.java
similarity index 99%
rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/PurchaseVo.java
rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/PurchaseVo.java
index 9181cbbf5..0a0860cf3 100644
--- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/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;
 
diff --git a/app/build.gradle b/app/build.gradle
index 14407f642..b8e7ebef4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.alibaba.arouter'
 android {
-    namespace "myname.pdlive.shayu"
+    namespace "com.pandoralive.shayu"
     dexOptions {
         jumboMode = true
     }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 6f4c447c6..33167f52e 100644
--- 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
 
diff --git a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java
index f0619923c..9aeb9d016 100644
--- 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.
diff --git a/app/src/main/java/com/shayu/phonelive/utils/CustomMessageReceiver.java b/app/src/main/java/com/shayu/phonelive/utils/CustomMessageReceiver.java
index 4a28cd539..913b822b6 100644
--- 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 {
 
diff --git a/build.gradle b/build.gradle
index 0441438d0..4cacedd46 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ buildscript {
         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.github.jadepeakpoet.ARouter:arouter-register:1.0.3"
diff --git a/common/build.gradle b/common/build.gradle
index 5e0dd1852..a84333437 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -222,7 +222,7 @@ dependencies {
     api project(':lib_google')
 
     //samsung插件包
-    api project(':IAP6Helper')
+    //api project(':IAP6Helper')
 
     //文字渐变色
     api 'com.github.FlyJingFish:GradientTextView:1.2.4'
diff --git a/common/libs/samsung-iap-6.1.1.aar b/common/libs/samsung-iap-6.1.1.aar
new file mode 100644
index 000000000..4195da69d
Binary files /dev/null and b/common/libs/samsung-iap-6.1.1.aar differ
diff --git a/common/src/main/java/com/yunbao/common/bean/UserBean.java b/common/src/main/java/com/yunbao/common/bean/UserBean.java
index aa44fc257..4e55f9cad 100644
--- 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;
diff --git a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
index 62585d204..8ac880ee1 100644
--- 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;
@@ -456,6 +459,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);
+                        }
                     });
 
         }
diff --git a/common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java b/common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java
index d77d30acc..d4b4080e2 100644
--- 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);
+    }
+
+
     /**
      * 消耗指定商品
      *
diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
index e1445f947..869cfbf92 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
@@ -235,7 +235,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
                     //丢包率
                     long lossRate = statusBean.packetLostRate;
                     //带宽
-                    String googAvailableSendBandwidth = statusReport.googAvailableSendBandwidth;
+//                    String googAvailableSendBandwidth = statusReport.googAvailableSendBandwidth;
 //                    Log.e("网速和内存", "获取视频：" + resolution + "    丢包率：" + lossRate + "     带宽：" + googAvailableSendBandwidth);
                 }
             }
diff --git a/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java b/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java
index 6ec25fd5b..8fa0a3d02 100644
--- 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();
         }
+
     }
 
 
diff --git a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
index 0a29ea40c..5c83284a9 100644
--- a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
+++ b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
@@ -306,7 +306,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);
+                    }
+                });
     }
 
     /**
diff --git a/settings.gradle b/settings.gradle
index b391e1573..c0913d2fb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,4 +6,4 @@ include ':Share'
 include ':pluginsForAnchor'
 //include ':lib_huawei'
 include ':lib_google'
-include ':IAP6Helper'
+//include ':IAP6Helper'