Merge remote-tracking branch 'origin/master'

app/src/main/AndroidManifest.xml

@@ -83,6 +83,7 @@
         tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
     <uses-permission android:name="com.android.vending.BILLING" />
+    <uses-permission android:name="com.samsung.android.iap.permission.BILLING"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <!-- Android11新增 -->
     <!--    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->

app/src/main/java/com/shayu/phonelive/AppContext.java

@@ -339,7 +339,7 @@ public class AppContext extends CommonAppContext {
         if (!CommonAppConfig.IS_UPLOAD_ERROR_LOG) {
             return;
         }
-        if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
+        if (CommonAppConfig.IS_GOOGLE_PLAY != 2) {
             GoogleUtils.newInstance(this).initializeApp(this);
         }
     }

common/build.gradle

@@ -216,7 +216,7 @@ dependencies {
     //api project(':lib_huawei')
 
     //google插件包
-    //api project(':lib_google')
+    api project(':lib_google')
 
     //samsung插件包
     api project(':IAP6Helper')

common/src/main/java/com/yunbao/common/CommonAppContext.java

@@ -55,7 +55,7 @@ public class CommonAppContext extends MultiDexApplication {
 //        RongPushClient.setPushConfig(config); //将推送相关配置设置到 SDK
         //设置新加坡融云服务器 有时候国内收不到推送是因为这个
         RongIMClient.setServerInfo("navsg01.cn.ronghub.com", null);
-        if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
+        if (CommonAppConfig.IS_GOOGLE_PLAY != 2) {
             //谷歌推送
             PushConfig gconfig = new PushConfig.Builder().enableFCM(true).build();
             RongPushClient.setPushConfig(gconfig);

common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java

@@ -329,6 +329,8 @@ public class CommonHttpUtil {
             isGoogle = "1";
         } else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
             isGoogle = "2";
+        }else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
+            isGoogle = "3";
         } else {
             isGoogle = "-1";
         }

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;
@@ -44,6 +43,13 @@ public class SamsungUtil {
         iapHelper.setOperationMode(HelperDefine.OperationMode.OPERATION_MODE_PRODUCTION);
     }
 
+    public void dispose() {
+        if (iapHelper != null) {
+            iapHelper.dispose();
+        }
+    }
+
+
     /**
      * 购买
      *

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

@@ -97,9 +97,13 @@ public class APKUpdateCustomPopup extends CenterPopupView {
                     if (CommonAppConfig.IS_GOOGLE_PLAY == 2 && APKManager.get().getAPKGoogleIsUp() != 1) {
                         dismiss();
                     }
+                    if (CommonAppConfig.IS_GOOGLE_PLAY == 3 && APKManager.get().getAPKGoogleIsUp() != 1) {
+                        dismiss();
+                    }
                     if (CommonAppConfig.IS_GOOGLE_PLAY == 0 && APKManager.get().getApkIsUp() != 1) {
                         dismiss();
                     }
+
                 }
 
             }

config.gradle

@@ -4,8 +4,8 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 33,
-            versionCode      : 460,
+            versionCode      : 462,
-            versionName      : "6.6.4"
+            versionName      : "6.6.3"
     ]
     manifestPlaceholders = [
             //正式、
@@ -21,10 +21,10 @@ ext {
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 
 //            true表示谷歌支付 false    0 链接包   1 谷歌包   2华为包  3 samsung包
-            isGooglePlay     : 0,
+            isGooglePlay     : 3,
             //是否上报异常日志
             isUploadLog      : true,
             //是否打包成插件包模式
-            isPluginModel    : true,
+            isPluginModel    : false,
     ]
 }

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

@@ -117,11 +117,6 @@ 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/views/SystemMessageViewHolder.java

@@ -66,6 +66,7 @@ import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.AbsViewHolder;
 import com.yunbao.common.views.MsgSysDelPopupView;
 import com.yunbao.common.views.PlaySettingPopupView;
+import com.yunbao.common.views.TopGradual;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.EditNameRemarksActivity;
 import com.yunbao.live.activity.SystemMessageActivity;
@@ -76,7 +77,6 @@ import com.yunbao.live.adapter.YouLikeMessageAdapter;
 import com.yunbao.live.bean.SearchUserBean;
 import com.yunbao.live.bean.SystemMessageBean;
 import com.yunbao.live.bean.YouLikeBean;
-import com.yunbao.common.views.TopGradual;
 import com.yunbao.live.http.ImHttpConsts;
 import com.yunbao.live.http.ImHttpUtil;
 

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

@@ -185,6 +185,7 @@ public class EntryActivity extends AppCompatActivity {
         activity = this;
         Contexts = this;
         setStatusBar();
+
         googleLayout = findViewById(R.id.googleLayout);
 
         if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
@@ -540,7 +541,7 @@ public class EntryActivity extends AppCompatActivity {
                 Log.d("OpenInstall", "appData.getData()= " + appData.getData());
                 //获取自定义数据
                 if (appData.getData() != null && !appData.getData().equals("")) {
-                    if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2) {
+                    if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2|| CommonAppConfig.IS_GOOGLE_PLAY == 3) {
 
                     } else {
                         JSONObject data = JSON.parseObject(appData.getData());
@@ -576,7 +577,7 @@ public class EntryActivity extends AppCompatActivity {
      */
     private void loginBuyThird(LoginData data) {
         mLoginType = data.getType();
-        if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2) {
+        if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2||CommonAppConfig.IS_GOOGLE_PLAY == 3) {
             mPromoCode = "";
         }
         MainHttpUtil.loginByThird(UserID, data.getOpenID(), mPromoCode, mUuidDevice, data.getNickName(), data.getAvatar(), data.getType(), new HttpCallback() {
@@ -624,7 +625,7 @@ public class EntryActivity extends AppCompatActivity {
             public void callback(UserBean bean) {
 
                 if (mFirstLogin) {
-                    if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2) {
+                    if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2|| CommonAppConfig.IS_GOOGLE_PLAY == 3) {
                         EntryActivity.this.startActivity(new Intent(EntryActivity.this, OneLoginActivity.class));
                     } else {
                         HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor").execute(new HttpCallback() {

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

@@ -295,7 +295,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
             WebViewActivity.forward(mContext, getIntent().getStringExtra("activityUrl"), true, false);
         }
 
-        if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
+        if (CommonAppConfig.IS_GOOGLE_PLAY != 2) {
            /* GoogleUtils.newInstance(MainActivity.this).setFirebaseTokenListener(MainActivity.this, new GoogleUtils.FirebaseTokenListener() {
                 @Override
                 public void onResultToken(String token) {

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

@@ -86,6 +86,9 @@ public class MyWalletActivity extends AbsActivity {
         } else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
             samsungUtil = SamsungUtil.newInstance(mContext);
             samsungUtil.init();
+        }else{
+            googleUtils = new GoogleUtils(mContext);
+            googleUtils.initGooglePay();
         }
 
 

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

@@ -404,7 +404,7 @@ public class RegisterActivity extends AbsActivity {
                 //获取自定义数据
                 if (appData.getData() != null && !appData.getData().equals("")) {
                     JSONObject data = JSON.parseObject(appData.getData());
-                    if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2) {
+                    if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2|| CommonAppConfig.IS_GOOGLE_PLAY == 3) {
                         yqm_view.setVisibility(View.VISIBLE);
                         MainHttpUtil.getDeviceLoginType(new HttpCallback() {
                             @Override

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

settings.gradle

@@ -5,5 +5,5 @@ include ':FaceUnity'
 include ':Share'
 include ':pluginsForAnchor'
 //include ':lib_huawei'
-//include ':lib_google'
+include ':lib_google'
 include ':IAP6Helper'