public_service / public_sdk_android

Go to a project
Toggle navigation Toggle navigation pinning
lizhihui
abdda176 1 parent 6ee0d8ca

demo更新

Inline Side-by-side
Showing 4 changed files with 132 additions and 2 deletions
1 +<component name="ProjectCodeStyleConfiguration">
2 + <code_scheme name="Project" version="173">
3 + <codeStyleSettings language="XML">
4 + <indentOptions>
5 + <option name="CONTINUATION_INDENT_SIZE" value="4" />
6 + </indentOptions>
7 + <arrangement>
8 + <rules>
9 + <section>
10 + <rule>
11 + <match>
12 + <AND>
13 + <NAME>xmlns:android</NAME>
14 + <XML_ATTRIBUTE />
15 + <XML_NAMESPACE>^$</XML_NAMESPACE>
16 + </AND>
17 + </match>
18 + </rule>
19 + </section>
20 + <section>
21 + <rule>
22 + <match>
23 + <AND>
24 + <NAME>xmlns:.*</NAME>
25 + <XML_ATTRIBUTE />
26 + <XML_NAMESPACE>^$</XML_NAMESPACE>
27 + </AND>
28 + </match>
29 + <order>BY_NAME</order>
30 + </rule>
31 + </section>
32 + <section>
33 + <rule>
34 + <match>
35 + <AND>
36 + <NAME>.*:id</NAME>
37 + <XML_ATTRIBUTE />
38 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
39 + </AND>
40 + </match>
41 + </rule>
42 + </section>
43 + <section>
44 + <rule>
45 + <match>
46 + <AND>
47 + <NAME>.*:name</NAME>
48 + <XML_ATTRIBUTE />
49 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
50 + </AND>
51 + </match>
52 + </rule>
53 + </section>
54 + <section>
55 + <rule>
56 + <match>
57 + <AND>
58 + <NAME>name</NAME>
59 + <XML_ATTRIBUTE />
60 + <XML_NAMESPACE>^$</XML_NAMESPACE>
61 + </AND>
62 + </match>
63 + </rule>
64 + </section>
65 + <section>
66 + <rule>
67 + <match>
68 + <AND>
69 + <NAME>style</NAME>
70 + <XML_ATTRIBUTE />
71 + <XML_NAMESPACE>^$</XML_NAMESPACE>
72 + </AND>
73 + </match>
74 + </rule>
75 + </section>
76 + <section>
77 + <rule>
78 + <match>
79 + <AND>
80 + <NAME>.*</NAME>
81 + <XML_ATTRIBUTE />
82 + <XML_NAMESPACE>^$</XML_NAMESPACE>
83 + </AND>
84 + </match>
85 + <order>BY_NAME</order>
86 + </rule>
87 + </section>
88 + <section>
89 + <rule>
90 + <match>
91 + <AND>
92 + <NAME>.*</NAME>
93 + <XML_ATTRIBUTE />
94 + <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
95 + </AND>
96 + </match>
97 + <order>ANDROID_ATTRIBUTE_ORDER</order>
98 + </rule>
99 + </section>
100 + <section>
101 + <rule>
102 + <match>
103 + <AND>
104 + <NAME>.*</NAME>
105 + <XML_ATTRIBUTE />
106 + <XML_NAMESPACE>.*</XML_NAMESPACE>
107 + </AND>
108 + </match>
109 + <order>BY_NAME</order>
110 + </rule>
111 + </section>
112 + </rules>
113 + </arrangement>
114 + </codeStyleSettings>
115 + </code_scheme>
116 +</component>
...\ No newline at end of file ...\ No newline at end of file
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
3 <component name="GradleSettings"> 3 <component name="GradleSettings">
4 <option name="linkedExternalProjectsSettings"> 4 <option name="linkedExternalProjectsSettings">
5 <GradleProjectSettings> 5 <GradleProjectSettings>
6 + <compositeConfiguration>
7 + <compositeBuild compositeDefinitionSource="SCRIPT" />
8 + </compositeConfiguration>
6 <option name="distributionType" value="DEFAULT_WRAPPED" /> 9 <option name="distributionType" value="DEFAULT_WRAPPED" />
7 <option name="externalProjectPath" value="$PROJECT_DIR$" /> 10 <option name="externalProjectPath" value="$PROJECT_DIR$" />
8 <option name="modules"> 11 <option name="modules">
...@@ -12,6 +15,7 @@ ...@@ -12,6 +15,7 @@
12 </set> 15 </set>
13 </option> 16 </option>
14 <option name="resolveModulePerSourceSet" value="false" /> 17 <option name="resolveModulePerSourceSet" value="false" />
18 + <option name="testRunner" value="PLATFORM" />
15 </GradleProjectSettings> 19 </GradleProjectSettings>
16 </option> 20 </option>
17 </component> 21 </component>
......
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="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> 3 + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
4 <output url="file://$PROJECT_DIR$/build/classes" /> 4 <output url="file://$PROJECT_DIR$/build/classes" />
5 </component> 5 </component>
6 <component name="ProjectType"> 6 <component name="ProjectType">
......
1 package com.youai.foolsdk.demo; 1 package com.youai.foolsdk.demo;
2 2
3 +import android.Manifest;
4 +import android.annotation.TargetApi;
3 import android.app.Activity; 5 import android.app.Activity;
4 import android.app.AlertDialog; 6 import android.app.AlertDialog;
5 import android.app.Application; 7 import android.app.Application;
...@@ -106,7 +108,7 @@ public class AppActivity extends Activity implements OnClickListener { ...@@ -106,7 +108,7 @@ public class AppActivity extends Activity implements OnClickListener {
106 @Override 108 @Override
107 public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { 109 public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
108 super.onRequestPermissionsResult(requestCode, permissions, grantResults); 110 super.onRequestPermissionsResult(requestCode, permissions, grantResults);
109 - PoolSdkHelper.onRequestPermissionsResult(requestCode, permissions, grantResults); 111 + PoolSdkHelper.onRequestPermissionsResult(this,requestCode,permissions,grantResults);
110 } 112 }
111 113
112 @Override 114 @Override
...@@ -175,6 +177,14 @@ public class AppActivity extends Activity implements OnClickListener { ...@@ -175,6 +177,14 @@ public class AppActivity extends Activity implements OnClickListener {
175 +"\ngamesimplename:"+PoolSdkConfig.getConfigByKey("gamesimplename") 177 +"\ngamesimplename:"+PoolSdkConfig.getConfigByKey("gamesimplename")
176 +"\nlogincheckurl:"+PoolSdkConfig.getConfigByKey("logincheckurl") 178 +"\nlogincheckurl:"+PoolSdkConfig.getConfigByKey("logincheckurl")
177 ); 179 );
180 +
181 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.DONUT) {
182 + if(AppActivity.this.getApplicationInfo().targetSdkVersion >= 23 && Build.VERSION.SDK_INT >= 23){
183 + requestPermissions(new String[]{Manifest.permission.READ_PHONE_STATE,Manifest.permission.WRITE_EXTERNAL_STORAGE},1);
184 + }else {
185 + //低版本不需要动态申请权限
186 + }
187 + }
178 } 188 }
179 189
180 @Override 190 @Override
......