Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,7 @@ package com.yunbao.common.manager;
 
 import android.app.Activity;
 import android.content.Context;
+import android.os.Build;
 import android.os.Handler;
 import android.text.TextUtils;
 
@@ -276,11 +277,12 @@ public class IMLoginManager extends BaseCacheManager {
     }
 
     public boolean isMountEffect() {
-        return getBoolean(MountEffect, true);
+
+        return getBoolean(MountEffect, !(Build.VERSION.SDK_INT < Build.VERSION_CODES.O));
     }
 
     public boolean isGiftEffect() {
-        return getBoolean(GiftEffect, true);
+        return getBoolean(GiftEffect, !(Build.VERSION.SDK_INT < Build.VERSION_CODES.O));
     }
 
     /**

config.gradle

@@ -24,7 +24,7 @@ ext {
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 
 //            true表示谷歌支付 false
-            isGooglePlay     :  false,
+            isGooglePlay     :  true,
             //是否上报异常日志
             isUploadLog      :  true
     ]