Merge remote-tracking branch 'origin/master' into pdlive_samsung

# Conflicts:
#	config.gradle
#	main/src/main/java/com/yunbao/main/activity/GoogleFragment.java

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

@@ -29,11 +29,8 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 新写Google内付工具类做简单的封装
@@ -207,6 +204,11 @@ public class GoogleBillingManage implements PurchasesUpdatedListener {
         }
     }
 
+    public boolean getGoogleService() {
+        int code = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mContext);
+        return code == 0;
+    }
+
     int resultCode = -1;
     String resultToken = "";
     String resultOrderId = "";