public_service / public_sdk_android

Go to a project
Toggle navigation Toggle navigation pinning
lizhihui
78e63e4b 2 parents 3ba971b5 cf4d9684

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
Inline Side-by-side
Showing 5 changed files with 9 additions and 4 deletions
...@@ -43,3 +43,5 @@ ...@@ -43,3 +43,5 @@
43 - 增加创建订单失败和登录验证失败的日志上报，直接替换PoolSdk_V2_xxxx.jar 43 - 增加创建订单失败和登录验证失败的日志上报，直接替换PoolSdk_V2_xxxx.jar
44 - 2020-4-30 44 - 2020-4-30
45 - 直接替换PoolSdk_V2_xxxx.jar 45 - 直接替换PoolSdk_V2_xxxx.jar
46 +- 2020-06-29
47 + - 删除权限回调中的激活，直接替换PoolSdk_V2_xxxx.jar
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 + <component name="GradleMigrationSettings" migrationVersion="1" />
3 <component name="GradleSettings"> 4 <component name="GradleSettings">
4 <option name="linkedExternalProjectsSettings"> 5 <option name="linkedExternalProjectsSettings">
5 <GradleProjectSettings> 6 <GradleProjectSettings>
6 - <compositeConfiguration> 7 + <option name="testRunner" value="PLATFORM" />
7 - <compositeBuild compositeDefinitionSource="SCRIPT" />
8 - </compositeConfiguration>
9 <option name="distributionType" value="DEFAULT_WRAPPED" /> 8 <option name="distributionType" value="DEFAULT_WRAPPED" />
10 <option name="externalProjectPath" value="$PROJECT_DIR$" /> 9 <option name="externalProjectPath" value="$PROJECT_DIR$" />
11 <option name="modules"> 10 <option name="modules">
...@@ -15,7 +14,6 @@ ...@@ -15,7 +14,6 @@
15 </set> 14 </set>
16 </option> 15 </option>
17 <option name="resolveModulePerSourceSet" value="false" /> 16 <option name="resolveModulePerSourceSet" value="false" />
18 - <option name="testRunner" value="PLATFORM" />
19 </GradleProjectSettings> 17 </GradleProjectSettings>
20 </option> 18 </option>
21 </component> 19 </component>
......
No preview for this file type
...@@ -51,3 +51,8 @@ gameAppkey : 在公共SDK后台的Md5加密的KEY ...@@ -51,3 +51,8 @@ gameAppkey : 在公共SDK后台的Md5加密的KEY
51 115.159.109.183 51 115.159.109.183
52 118.89.113.235 52 118.89.113.235
53 118.89.196.17 53 118.89.196.17
54 +### 4. 充值服务器IP地址(光卡)
55 + 134.175.115.242
56 + 134.175.126.105
57 + 134.175.25.149
58 + 106.53.30.119
...\ No newline at end of file ...\ No newline at end of file
......
No preview for this file type