融云升级

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'

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;

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

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);
+    }
+
+
     /**
      * 消耗指定商品
      *