三星内购调用

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

@@ -17,14 +17,17 @@ public class OpenAdModel extends BaseModel {
     public static final int MODEL_SQUARE = 1;//正方形
     public static final int MODEL_RECTANGLE = 2;//长方形
     public static final int MODEL_BOTTOM = 3;//底部
+    public static final int SHOW_DEF = 1;//1. 杀死程序后弹出；
+    public static final int SHOW_DIY = 2;//2. 自定义时间：自上次弹出弹窗后，00:00小时（范围：00:01小时-48:00小时）后再弹出（到时间后也需满足触发条件再弹出）；
+    public static final int SHOW_ONE = 3;//3. 仅弹出一次；
     @SerializedName("id")
     private int id;
     @SerializedName("popup_location")
     private int type = TYPE_HOME;
     @SerializedName("activity_url")
-    private String url;
+    private String url;//点击跳转url
     @SerializedName("image_url")
-    private String imageUrl;
+    private String imageUrl;//图片url
     @SerializedName("display_time")
     private int showTime; //持续展示时间
     @SerializedName("delay_show_time")
@@ -37,11 +40,48 @@ public class OpenAdModel extends BaseModel {
     private String endTime;//活动结束时间
     @SerializedName("popup_permission")
     private int permission;
+    @SerializedName("popup_frequency")
+    private int showModel = SHOW_DEF;//显示模式，1：杀死程序后弹出 2：指定时间内（本机时间） 3：1. 仅弹出一次
+    @SerializedName("popup_frequency_time")
+    private String section = "0";// SHOW_DEF = 2
 
 
     public OpenAdModel() {
     }
 
+    public static OpenAdModel createTestData() {
+        OpenAdModel model = new OpenAdModel();
+        model.id=3;
+        model.type=1;
+        model.url = "/h5/GuildTournament/20230821/rank.html";
+        model.imageUrl = "https://ceshi.yaoulive.com/data/upload/20230913/1694589490.png";
+        model.showTime = 10;
+        model.delayShowTime = 0;
+        model.model = MODEL_SQUARE;
+        model.startTime = "2019-01-01 00:00:00";
+        model.endTime = "2029-01-01 00:00:00";
+        model.permission = 4;
+        model.showModel = SHOW_DIY;
+        model.section = "5";
+        return model;
+    }
+
+    public int getShowModel() {
+        return showModel;
+    }
+
+    public void setShowModel(int showModel) {
+        this.showModel = showModel;
+    }
+
+    public String getSection() {
+        return section;
+    }
+
+    public void setSection(String section) {
+        this.section = section;
+    }
+
     public int getType() {
         return type;
     }

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

@@ -58,7 +58,7 @@ public class IMLoginManager extends BaseCacheManager {
     }
 
     public boolean getRedPoint() {
-        return !TextUtils.isEmpty(getString("RedPoint")) && !TextUtils.equals(getString("RedPoint"), "1");
+        return !TextUtils.isEmpty(getString("RedPoint")) || !TextUtils.equals(getString("RedPoint"), "1");
     }
  public void setQuickGiftIfFirst() {
         put("quick_gift_if_first", "1");

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

@@ -11,6 +11,8 @@ import com.yunbao.common.dialog.OpenAdBottomDialogPopup;
 import com.yunbao.common.dialog.OpenAdCenterDialogPopup;
 import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
+import com.yunbao.common.utils.SpUtil;
+import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 
 import java.util.ArrayList;
@@ -93,6 +95,18 @@ public class OpenAdManager {
                 if (type == OpenAdModel.TYPE_LIVE && !model.userIsPermission(isGuard)) {
                     continue;
                 }
+                if (model.getShowModel() == OpenAdModel.SHOW_ONE) {
+                    if (SpUtil.getInstance().getBooleanValue("open_ad_popup_" + model.getId())) {
+                        continue;
+                    }
+                    SpUtil.getInstance().setBooleanValue("open_ad_popup_" + model.getId(), true);
+                }
+                if (model.getShowModel() == OpenAdModel.SHOW_DIY) {
+                    String value = SpUtil.getStringValue("open_ad_popup_time_" + model.getId());
+                    if (!StringUtil.isEmpty(value) && System.currentTimeMillis() < Long.parseLong(value)) {
+                        continue;
+                    }
+                }
                 if (runnableMap.containsKey(model.getId())) {
                     AdRunnable runnable = runnableMap.get(model.getId());
                     if (runnable != null) {
@@ -166,6 +180,10 @@ public class OpenAdManager {
                 return;
             }
             showMap.put(model.getId(), true);
+            if (model.getShowModel() == OpenAdModel.SHOW_DIY) {
+                String nextTime= String.valueOf(System.currentTimeMillis() + (Long.parseLong(model.getSection()) * 60 * 1000));
+                SpUtil.setStringValue("open_ad_popup_time_" + model.getId(), nextTime);
+            }
             if (model.getModel() == OpenAdModel.MODEL_BOTTOM) {
                 new OpenAdBottomDialogPopup(CommonAppContext.getTopActivity(), model).setListener((bean, position) -> {
                 }).showDialog();

common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java

@@ -11,18 +11,72 @@ 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;
 
 public class SamsungUtil {
 
-    public void init(Context context) {
+    private Context mContext;
-        //初始化
-        IapHelper iapHelper = IapHelper.getInstance(context);
 
-        //设置支付模式  OPERATION_MODE_TEST  测试模式
+    IapHelper iapHelper;
+
+    private static SamsungUtil samsungUtil;
+
+    public static SamsungUtil newInstance(Context context) {
+        if (samsungUtil == null) {
+            samsungUtil = new SamsungUtil(context);
+        }
+        return samsungUtil;
+    }
+
+    public SamsungUtil(Context mContext) {
+        this.mContext = mContext;
+    }
+
+    /**
+     * 初始化
+     */
+    public void init() {
+        iapHelper = IapHelper.getInstance(mContext);
+        //设置支付模式 OPERATION_MODE_PRODUCTION 正式模式  OPERATION_MODE_TEST  测试模式
         iapHelper.setOperationMode(HelperDefine.OperationMode.OPERATION_MODE_TEST);
+    }
 
+    /**
+     * 购买
+     *
+     * @param skuId
+     */
+    public void buy(String skuId) {
+        //购买
+        iapHelper.startPayment(skuId, "", new OnPaymentListener() {
+            @Override
+            public void onPayment(ErrorVo _errorVO, PurchaseVo _purchaseVO) {
+                L.e(_errorVO.getErrorString());
+            }
+        });
+    }
+
+    /**
+     * 消耗指定商品
+     *
+     * @param skuId
+     */
+    public void consume(String skuId) {
+        //消耗
+        iapHelper.consumePurchasedItems(skuId, new OnConsumePurchasedItemsListener() {
+            @Override
+            public void onConsumePurchasedItems(ErrorVo _errorVO, ArrayList<ConsumeVo> _consumeList) {
+
+            }
+        });
+    }
+
+    /**
+     * 消耗所有未消耗的消耗品
+     */
+    public void query() {
         //查询商品  PRODUCT_TYPE_ITEM 消耗品&非消耗品
         iapHelper.getOwnedList(HelperDefine.PRODUCT_TYPE_ITEM, new OnGetOwnedListListener() {
             @Override
@@ -33,6 +87,7 @@ public class SamsungUtil {
                             for (OwnedProductVo item : _ownedList) {
                                 if (item.getIsConsumable()) {
                                     // TODO: 消耗尚未消耗的消耗品
+                                    consume(item.getPurchaseId());
                                 }
                             }
                         }
@@ -42,21 +97,5 @@ public class SamsungUtil {
                 }
             }
         });
-
-        //购买
-        iapHelper.startPayment("zs640", "", new OnPaymentListener() {
-            @Override
-            public void onPayment(ErrorVo _errorVO, PurchaseVo _purchaseVO) {
-
-            }
-        });
-
-        //消耗
-        iapHelper.consumePurchasedItems("zs640", new OnConsumePurchasedItemsListener() {
-            @Override
-            public void onConsumePurchasedItems(ErrorVo _errorVO, ArrayList<ConsumeVo> _consumeList) {
-
-            }
-        });
     }
 }

common/src/main/java/com/yunbao/common/utils/GoogleUtils.java

@@ -34,7 +34,6 @@ public class GoogleUtils {
         this.mContext = mContext;
     }
 
-
     public static GoogleUtils newInstance(Context mContext) {
         if (googleUtils == null) {
             googleUtils = new GoogleUtils(mContext);
@@ -43,6 +42,18 @@ public class GoogleUtils {
     }
 
 
+    public boolean getGoogleService() {
+        boolean flag;
+        try {
+            Class<?> clz = mActivity.getClassLoader().loadClass("com.shayu.lib_google.utils.GoogleBillingManage");
+            googlePay = clz.getConstructor(Activity.class).newInstance(mActivity);
+            flag = (boolean) googlePay.getClass().getMethod("getGoogleService").invoke(googlePay);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return flag;
+    }
+
     public static GoogleUtils newInstance(Activity mContext) {
         if (googleUtils == null) {
             googleUtils = new GoogleUtils(mContext);

common/src/main/java/com/yunbao/common/views/InteractionGamesChildViewHolder.java

@@ -34,7 +34,7 @@ public class InteractionGamesChildViewHolder extends RecyclerView.ViewHolder {
 
 
         funGameName.setText(model.getTitle());
-        if (!TextUtils.isEmpty(model.getSudGameIsNew())||TextUtils.equals(model.getSudGameIsNew(),"1")){
+        if (!TextUtils.isEmpty(model.getSudGameIsNew())&&TextUtils.equals(model.getSudGameIsNew(),"1")){
             itemView.findViewById(R.id.icon_new_game).setVisibility(View.VISIBLE);
         }else {
             itemView.findViewById(R.id.icon_new_game).setVisibility(View.GONE);

common/src/main/res/values-en-rUS/string.xml

@@ -1390,8 +1390,8 @@ Limited ride And limited avatar frame</string>
     <string name="conversion_quantity">Exchange quantity:</string>
     <string name="conversion_quantity_need">Need %s</string>
     <string name="conversion_quantity_need_of_use">Exchange&amp;Usage Rules:</string>
-    <string name="conversion_quantity_need_of_use1">·One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance;</string>
+    <string name="conversion_quantity_need_of_use1">1.One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance;</string>
-    <string name="conversion_quantity_need_of_use2">·One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie;</string>
+    <string name="conversion_quantity_need_of_use2">2.One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie;</string>
-    <string name="conversion_quantity_need_of_use3">·Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.</string>
+    <string name="conversion_quantity_need_of_use3">3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.</string>
 
 </resources>

common/src/main/res/values-zh-rHK/strings.xml

@@ -1387,7 +1387,7 @@
     <string name="conversion_quantity">兌換數量：</string>
     <string name="conversion_quantity_need">需要 %s</string>
     <string name="conversion_quantity_need_of_use">兌換&amp;使用規則：</string>
-    <string name="conversion_quantity_need_of_use1">·1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
+    <string name="conversion_quantity_need_of_use1">1.1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
-    <string name="conversion_quantity_need_of_use2">·1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
+    <string name="conversion_quantity_need_of_use2">2.1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
-    <string name="conversion_quantity_need_of_use3">·觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲 打擊。</string>
+    <string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
 </resources>

common/src/main/res/values-zh-rTW/strings.xml

@@ -1386,7 +1386,7 @@
     <string name="conversion_quantity">兌換數量：</string>
     <string name="conversion_quantity_need">需要 %s</string>
     <string name="conversion_quantity_need_of_use">兌換&amp;使用規則：</string>
-    <string name="conversion_quantity_need_of_use1">·1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
+    <string name="conversion_quantity_need_of_use1">1.1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
-    <string name="conversion_quantity_need_of_use2">·1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
+    <string name="conversion_quantity_need_of_use2">2.1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
-    <string name="conversion_quantity_need_of_use3">·觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲 打擊。</string>
+    <string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
 </resources>

common/src/main/res/values-zh/strings.xml

@@ -1386,8 +1386,8 @@
     <string name="conversion_quantity">兌換數量：</string>
     <string name="conversion_quantity_need">需要 %s</string>
     <string name="conversion_quantity_need_of_use">兌換&amp;使用規則：</string>
-    <string name="conversion_quantity_need_of_use1">·1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
+    <string name="conversion_quantity_need_of_use1">1.1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
-    <string name="conversion_quantity_need_of_use2">·1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
+    <string name="conversion_quantity_need_of_use2">2.1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
-    <string name="conversion_quantity_need_of_use3">·觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
+    <string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
 
 </resources>

common/src/main/res/values/strings.xml

@@ -1393,7 +1393,7 @@ Limited ride And limited avatar frame</string>
     <string name="conversion_quantity">Exchange quantity:</string>
     <string name="conversion_quantity_need">Need %s</string>
     <string name="conversion_quantity_need_of_use">Exchange&amp;Usage Rules:</string>
-    <string name="conversion_quantity_need_of_use1">·One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance;</string>
+    <string name="conversion_quantity_need_of_use1">1.One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance;</string>
-    <string name="conversion_quantity_need_of_use2">·One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie;</string>
+    <string name="conversion_quantity_need_of_use2">2.One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie;</string>
-    <string name="conversion_quantity_need_of_use3">·Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.</string>
+    <string name="conversion_quantity_need_of_use3">3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.</string>
 </resources>

config.gradle

@@ -19,11 +19,11 @@ ext {
             baiduAppKey      : "zgCgFhUKEOV7I3ZXDFpTfnRB",
 
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
-//            true表示谷歌支付 false    0 链接包   1 谷歌包   2华为包
+//            true表示谷歌支付 false    0 链接包   1 谷歌包   2华为包  3 三星包
-            isGooglePlay     :  1,
+            isGooglePlay     :  3,
             //是否上报异常日志
             isUploadLog      :  true,
             //是否打包成插件包模式
-            isPluginModel    :  true,
+            isPluginModel    :  false,
     ]
 }

lib_google/src/main/java/com/shayu/lib_google/utils/GoogleBillingManage.java

@@ -20,6 +20,7 @@ import com.android.billingclient.api.SkuDetails;
 import com.android.billingclient.api.SkuDetailsParams;
 import com.android.billingclient.api.SkuDetailsResponseListener;
 import com.google.android.gms.ads.identifier.AdvertisingIdClient;
+import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
 import com.google.android.gms.common.GooglePlayServicesRepairableException;
 
@@ -119,6 +120,11 @@ public class GoogleBillingManage implements PurchasesUpdatedListener {
         }
     }
 
+    public boolean getGoogleService() {
+        int code = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mContext);
+        return code == 0;
+    }
+
     int querySize = -1;
     JSONArray tokenList = new JSONArray();
     JSONArray orderList = new JSONArray();

live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java

@@ -1874,6 +1874,7 @@ public class LiveAudienceActivity extends LiveActivity {
         if (manager == null || manager.mLiveAudienceViewHolder == null || manager.mLiveAudienceViewHolder.mRedPointPrivilege == null) {
             return;
         }
+        manager.mLiveAudienceViewHolder.setShowCrownRed(isShow);
         if (isShow) {
             manager.mLiveAudienceViewHolder.mRedPointPrivilege.setVisibility(View.VISIBLE);
         } else {

live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java

@@ -720,6 +720,12 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
         liveHDDialogFragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveHDDialogFragment");
     }
 
+    private boolean mIsShow;
+
+    public void setShowCrownRed(boolean isShow) {
+        mIsShow = isShow;
+    }
+
     /**
      * 身份特权
      */
@@ -732,7 +738,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
 //        fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveRoleDialogFragment");
         new XPopup.Builder(mContext)
                 .enableDrag(false)
-                .asCustom(new LiveNewRolePopup(mContext, mRedPointPrivilege.getVisibility() == View.VISIBLE))
+                .asCustom(new LiveNewRolePopup(mContext, mIsShow))
                 .show();
         mRedPointPrivilege.setVisibility(View.GONE);
     }

live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

@@ -714,6 +714,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             combo_layout.setVisibility(View.GONE);
             if (IMLoginManager.get(mContext).getQuickGiftIfFirst()) {
                 quick_gift_reminder.setVisibility(View.VISIBLE);
+                IMLoginManager.get(mContext).setQuickGiftIfFirst();
             } else {
                 quick_gift_reminder.setVisibility(View.GONE);
             }

live/src/main/res/layout/view_live_audience.xml

@@ -454,8 +454,8 @@
 
                 <View
                     android:id="@+id/privilege_red_point"
-                    android:layout_width="10dp"
+                    android:layout_width="6dp"
-                    android:layout_height="10dp"
+                    android:layout_height="6dp"
                     android:layout_marginTop="5dp"
                     android:layout_marginEnd="10dp"
                     android:background="@drawable/bg_red_point"

main/src/main/java/com/yunbao/main/activity/GoogleFragment.java

@@ -17,8 +17,6 @@ import android.webkit.WebView;
 import androidx.fragment.app.Fragment;
 
 import com.facebook.appevents.AppEventsConstants;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.utils.GoogleUtils;
@@ -42,8 +40,6 @@ public class GoogleFragment extends Fragment {
 
     GoogleUtils googleUtils;
 
-    boolean isGoogleService = true;
-
     public GoogleFragment() {
     }
 
@@ -63,13 +59,8 @@ public class GoogleFragment extends Fragment {
         rlWebview = (WebView) view.findViewById(R.id.rlWebview);
         Log.e("ttt", url);
         rlWebview.loadUrl(url);
-
-        // 验证是否已在此设备上安装并启用Google Play服务，以及此设备上安装的旧版本是否为此客户端所需的版本
-        int code = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(getActivity());
-        if (code == ConnectionResult.SUCCESS) {
-            isGoogleService = true;
-            // 支持Google服务
         initGooglePay();
+        if (googleUtils.getGoogleService()) {
             new Thread() {
                 @Override
                 public void run() {

main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java

@@ -26,6 +26,7 @@ import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.pay.hw.HwBuilder;
+import com.yunbao.common.pay.samsung.SamsungUtil;
 import com.yunbao.common.utils.GoogleUtils;
 import com.yunbao.common.utils.L;
 import com.yunbao.common.utils.RouteUtil;
@@ -64,13 +65,13 @@ public class MyWalletActivity extends AbsActivity {
     GoogleUtils googleUtils;
 
     LoadingDialog loadingDialog;
+    SamsungUtil samsungUtil;
 
     @Override
     protected int getLayoutId() {
         return R.layout.activity_my_wallet;
     }
 
-    @Override
     protected void main() {
 
         super.main();
@@ -80,9 +81,13 @@ public class MyWalletActivity extends AbsActivity {
         if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
             googleUtils = new GoogleUtils(mContext);
             googleUtils.initGooglePay();
+        } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
+            hwBuilder = new HwBuilder(MyWalletActivity.this);
+        } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
+            samsungUtil = SamsungUtil.newInstance(mContext);
+            samsungUtil.init();
         }
 
-        hwBuilder = new HwBuilder(MyWalletActivity.this);
 
         vp_content = (ViewPager) findViewById(R.id.vp_content);
         TextView rView = (TextView) findViewById(R.id.rView);
@@ -158,6 +163,9 @@ public class MyWalletActivity extends AbsActivity {
         HuaWeiFragment huaWeiFragment1 = null;
         HuaWeiFragment huaWeiFragment2 = null;
 
+        SamsungFragment samsungFragment1 = null;
+        SamsungFragment samsungFragment2 = null;
+
         final String[] titles = {mContext.getString(R.string.diamond), mContext.getString(R.string.coins), mContext.getString(R.string.golden_beans)};
         if (getIntent().getStringExtra("tag") != null) {
             Log.i("tss", "首充");
@@ -195,6 +203,23 @@ public class MyWalletActivity extends AbsActivity {
                 Bundle bundle2 = new Bundle();
                 bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd");
                 huaWeiFragment2.setArguments(bundle2);
+            } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
+
+                rView.setVisibility(View.VISIBLE);
+                walletFragment = new WalletFragment();
+                Bundle bundle = new Bundle();
+                bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                walletFragment.setArguments(bundle);
+
+                samsungFragment1 = new SamsungFragment();
+                Bundle bundle1 = new Bundle();
+                bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                samsungFragment1.setArguments(bundle1);
+
+                samsungFragment2 = new SamsungFragment();
+                Bundle bundle2 = new Bundle();
+                bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                samsungFragment2.setArguments(bundle2);
             } else {
                 walletFragment = new WalletFragment();
                 Bundle bundle = new Bundle();
@@ -246,6 +271,21 @@ public class MyWalletActivity extends AbsActivity {
                 Bundle bundle2 = new Bundle();
                 bundle2.putString("url", CommonAppConfig.HOST + "/themes/simplebootx/appapi/mall/huaweipaygole.html?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd");
                 huaWeiFragment2.setArguments(bundle2);
+            } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
+                walletFragment = new WalletFragment();
+                Bundle bundle = new Bundle();
+                bundle.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&first_page=1&a=walletbean&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                walletFragment.setArguments(bundle);
+
+                samsungFragment1 = new SamsungFragment();
+                Bundle bundle1 = new Bundle();
+                bundle1.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaycoin&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                samsungFragment1.setArguments(bundle1);
+
+                samsungFragment2 = new SamsungFragment();
+                Bundle bundle2 = new Bundle();
+                bundle2.putString("url", CommonAppConfig.HOST + "/index.php?g=Appapi&m=Mall&a=googlepaygole&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&package_name=pd" + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0"));
+                samsungFragment2.setArguments(bundle2);
             } else {
                 Log.i("tss", "不是首充");
                 //链接版本
@@ -271,10 +311,11 @@ public class MyWalletActivity extends AbsActivity {
             fragments = new Fragment[]{googleFragment1, googleFragment2, walletFragment};
         } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
             fragments = new Fragment[]{huaWeiFragment1, huaWeiFragment2, walletFragment};
+        } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
+            fragments = new Fragment[]{samsungFragment1, samsungFragment2, walletFragment};
         } else {
             fragments = new Fragment[]{googleFragment1, googleFragment2, walletFragment};
         }
-
         MagicIndicator magicIndicator = (MagicIndicator) findViewById(R.id.magic_indicator);
         CommonNavigator commonNavigator = new CommonNavigator(this);
         commonNavigator.setAdjustMode(true);

main/src/main/java/com/yunbao/main/activity/SamsungFragment.java

@@ -0,0 +1,121 @@
+package com.yunbao.main.activity;
+
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+
+import androidx.fragment.app.Fragment;
+
+import com.yunbao.common.pay.samsung.SamsungUtil;
+import com.yunbao.common.utils.StringUtil;
+import com.yunbao.main.R;
+import com.yunbao.main.views.TestWebViewClient;
+
+@SuppressLint("ValidFragment")
+public class SamsungFragment extends Fragment {
+
+    private long lastClickTime = 0;
+    private static final long INTERVAL_TIME = 1500;
+
+    private View view;
+    public static String mOrderid, mProductId, MoneyUsds;
+
+    private WebView rlWebview;
+    private String url;
+    SamsungUtil samsungUtil;
+
+    public SamsungFragment() {
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        //通过参数中的布局填充获取对应布局
+        view = inflater.inflate(R.layout.activity_recharge, container, false);
+
+        assert getArguments() != null;
+        url = getArguments().getString("url");
+
+        if (StringUtil.isEmpty(url)) {
+            Log.e(TAG, "URL为空");
+            return view;
+        }
+        rlWebview = (WebView) view.findViewById(R.id.rlWebview);
+        Log.e("ttt", url);
+        rlWebview.loadUrl(url);
+        initSamsung();
+        WebSettings webSettings = rlWebview.getSettings();
+
+        webSettings.setDomStorageEnabled(true);
+        webSettings.setTextZoom(100);
+        webSettings.setUseWideViewPort(true);
+
+        webSettings.setJavaScriptEnabled(true); // 是否开启JS支持
+        webSettings.setJavaScriptCanOpenWindowsAutomatically(true); // 是否允许JS打开新窗口
+
+        webSettings.setLoadWithOverviewMode(true); // 缩放至屏幕大小
+        webSettings.setSupportZoom(true); // 是否支持缩放
+        webSettings.setBuiltInZoomControls(true); // 是否支持缩放变焦，前提是支持缩放
+
+        rlWebview.addJavascriptInterface(new JsInteration(), "androidObject");
+
+        TestWebViewClient testWebViewClient = new TestWebViewClient(getActivity(), rlWebview);
+
+        rlWebview.setWebViewClient(testWebViewClient);
+
+        return view;
+    }
+
+    String TAG = "SamsungPay";
+
+    private void initSamsung() {
+        samsungUtil = new SamsungUtil(getActivity());
+        samsungUtil.init();
+    }
+
+    private Handler payHandler = new Handler();
+
+    //js调用原生
+    public class JsInteration {
+
+        @JavascriptInterface
+        public void androidNewGoToGooglePay(String ProductId, String OrderNumber, String MoneyUsd) {
+            long currentTime = System.currentTimeMillis();
+            if (currentTime - lastClickTime > INTERVAL_TIME) {
+                mProductId = ProductId;
+                mOrderid = OrderNumber;
+                MoneyUsds = MoneyUsd;
+
+                SamsungUtil.newInstance(getActivity()).buy(mProductId);
+            }
+            lastClickTime = currentTime;
+
+            Log.e(TAG, "ProductId" + ProductId + "OrderNumber" + OrderNumber + "MoneyUsd" + MoneyUsd);
+        }
+
+        @JavascriptInterface
+        public void androidMethodBack() {
+            getActivity().onBackPressed();
+
+        }
+
+        @JavascriptInterface
+        public void androidGoBack() {
+            getActivity().onBackPressed();
+        }
+    }
+
+
+    public void release() {
+
+    }
+}
+

main/src/main/res/layout/view_main_home_live.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -16,7 +15,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginLeft="4dp"
-        android:layout_marginRight="10dp" />
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="55dp" />
 
     <FrameLayout
         android:id="@+id/btn_dismiss"

main/src/main/res/layout/view_main_home_live_recom.xml

@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginLeft="4dp"
+        android:layout_marginBottom="55dp"
         android:layout_marginRight="10dp"/>
 
 </LinearLayout>

main/src/main/res/layout/view_search_results_item.xml

@@ -76,9 +76,9 @@
 
                     <ImageButton
                         android:id="@+id/change_batch"
-                        android:layout_width="wrap_content"
+                        android:layout_width="80dp"
                         android:clickable="true"
-                        android:layout_height="wrap_content"
+                        android:layout_height="30dp"
                         android:layout_gravity="center_vertical|right"
                         android:background="@mipmap/icon_cange"
                         android:focusable="true" />