From a307e6f8644e0ccd55c47185122e3addc5a397b3 Mon Sep 17 00:00:00 2001
From: hch <16607480311@163.com>
Date: Mon, 15 Jan 2024 17:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=8E=BB=E6=94=AF=E4=BB=98=E6=97=A0=E5=8F=8D=E5=BA=94=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/common/pay/samsung/SamsungUtil.java     | 10 ++++++++--
 config.gradle                                          |  6 +++---
 .../com/yunbao/live/views/SystemMessageViewHolder.java |  4 ++--
 .../java/com/yunbao/main/activity/SamsungFragment.java |  1 +
 4 files changed, 14 insertions(+), 7 deletions(-)

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 ccd9c308b..d77d30acc 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
@@ -11,7 +11,6 @@ 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.utils.L;
 
 import java.util.ArrayList;
@@ -41,9 +40,16 @@ public class SamsungUtil {
     public void init() {
         iapHelper = IapHelper.getInstance(mContext);
         //设置支付模式 OPERATION_MODE_PRODUCTION 正式模式  OPERATION_MODE_TEST  测试模式
-        iapHelper.setOperationMode(HelperDefine.OperationMode.OPERATION_MODE_TEST);
+        iapHelper.setOperationMode(HelperDefine.OperationMode.OPERATION_MODE_PRODUCTION);
     }
 
+    public void dispose() {
+        if (iapHelper != null) {
+            iapHelper.dispose();
+        }
+    }
+
+
     /**
      * 购买
      *
diff --git a/config.gradle b/config.gradle
index f7586a40c..b3e4d8629 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,14 +4,14 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 33,
-            versionCode      : 460,
+            versionCode      : 461,
             versionName      : "6.6.3"
     ]
     manifestPlaceholders = [
             //正式、
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
 //             测试
-            serverHost       : " https://ceshi.yaoulive.com",
+            //serverHost       : " https://ceshi.yaoulive.com",
 
             //百度语音识别
 
diff --git a/live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java b/live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java
index 4a0f83171..3ea142f29 100644
--- a/live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java
@@ -357,11 +357,11 @@ public class SystemMessageViewHolder extends AbsViewHolder implements View.OnCli
             mRefreshView.setDataHelper(new CommonRefreshView.DataHelper<SystemMessageBean>() {
                 @Override
                 public RefreshAdapter<SystemMessageBean> getAdapter() {
-                    if (mAdapter == null && (SystemMessageActivity.type.equals("1"))) {
+                    if (mAdapter == null && (SystemMessageActivity.type.equals("1"))) {  //官方通知
                         mAdapter = new SystemMessageAdapter(mContext);
                     } else if (mAdapter == null && SystemMessageActivity.type.equals("2")) {
                         mAdapter = new InteractionMessageAdapter(mContext, SystemMessageViewHolder.this);
-                    } else if (mAdapter == null && SystemMessageActivity.type.equals("4")) {
+                    } else if (mAdapter == null && SystemMessageActivity.type.equals("4")) {  //系统消息
                         mAdapter = new SystemMessageNewAdapter(mContext);
                     }
                     return mAdapter;
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 d7ac7e665..6ec25fd5b 100644
--- a/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java
+++ b/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java
@@ -88,6 +88,7 @@ public class SamsungFragment extends Fragment {
 
     private void initSamsung() {
         samsungUtil = new SamsungUtil(getActivity());
+        samsungUtil.dispose();
         samsungUtil.init();
     }