Merge branch 'master' of http://gitlab.9133.com/public_service/public_sdk_android

# Conflicts:
#	demo/app/libs/PoolSdk_V2_200629.jar
#	libs/PoolSdk_V2_200629.jar

@@ -43,3 +43,5 @@
   - 增加创建订单失败和登录验证失败的日志上报，直接替换PoolSdk_V2_xxxx.jar
 - 2020-4-30
   - 直接替换PoolSdk_V2_xxxx.jar
+- 2020-06-29
+  - 删除权限回调中的激活，直接替换PoolSdk_V2_xxxx.jar

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -15,7 +14,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>

@@ -51,3 +51,8 @@ gameAppkey : 在公共SDK后台的Md5加密的KEY
     115.159.109.183
     118.89.113.235
     118.89.196.17
+### 4. 充值服务器IP地址(光卡)
+    134.175.115.242
+    134.175.126.105 
+    134.175.25.149
+    106.53.30.119
\ No newline at end of file