CNLive Android Team / ModulePedometer · Commits

Commit d519e4b79304bea45b53800ad1378b39a01cab3a

Authored by YangShuai
1 parent 5a33f1b0

1定位适配安卓Q

Inline Side-by-side
Showing 6 changed files with 47 additions and 17 deletions
config.gradle
  View file @d519e4b
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "1.0.1", 24 + version: "1.0.2",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
moudle_pedometer/build.gradle
  View file @d519e4b
@@ -3,7 +3,7 @@ apply plugin: 'com.android.library' @@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
3 apply plugin: 'org.greenrobot.greendao' 3 apply plugin: 'org.greenrobot.greendao'
4 apply from: './maven_push.gradle' 4 apply from: './maven_push.gradle'
5 android { 5 android {
6 - compileSdkVersion 28 6 + compileSdkVersion 29
7 buildToolsVersion "28.0.3" 7 buildToolsVersion "28.0.3"
8 8
9 useLibrary 'org.apache.http.legacy' 9 useLibrary 'org.apache.http.legacy'
moudle_pedometer/src/main/AndroidManifest.xml
  View file @d519e4b
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
21 tools:ignore="ProtectedPermissions" /> <!-- //这个权限用于访问GPS定位 --> 21 tools:ignore="ProtectedPermissions" /> <!-- //这个权限用于访问GPS定位 -->
22 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <!-- //获取统计数据 --> 22 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <!-- //获取统计数据 -->
23 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- //使用步行AR导航，配置Camera权限 --> 23 <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- //使用步行AR导航，配置Camera权限 -->
  24 + <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
24 <uses-permission android:name="android.permission.CAMERA" /> 25 <uses-permission android:name="android.permission.CAMERA" />
25 <uses-permission 26 <uses-permission
26 android:name="android.permission.SET_ALWAYS_FINISH" 27 android:name="android.permission.SET_ALWAYS_FINISH"
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollPedometerMainActivity.java
  View file @d519e4b
@@ -133,6 +133,19 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity { @@ -133,6 +133,19 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity {
133 * 一次申请一组权限（使用拒绝弹框）点击事件 133 * 一次申请一组权限（使用拒绝弹框）点击事件
134 */ 134 */
135 public void getPermissionsWithTip() { 135 public void getPermissionsWithTip() {
  136 + String[] permissions = null;
  137 + if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
  138 + permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
  139 + Manifest.permission.WRITE_EXTERNAL_STORAGE,
  140 + Manifest.permission.ACCESS_FINE_LOCATION,
  141 + Manifest.permission.ACCESS_COARSE_LOCATION};
  142 + } else {
  143 + permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
  144 + Manifest.permission.WRITE_EXTERNAL_STORAGE,
  145 + Manifest.permission.ACCESS_FINE_LOCATION,
  146 + Manifest.permission.ACCESS_COARSE_LOCATION,
  147 + Manifest.permission.ACCESS_BACKGROUND_LOCATION};
  148 + }
136 mPermissionsUtils 149 mPermissionsUtils
137 .setPermissionsListener(new PermissionsListener() { 150 .setPermissionsListener(new PermissionsListener() {
138 @Override 151 @Override
@@ -162,11 +175,7 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity { @@ -162,11 +175,7 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity {
162 .withActivity(CollPedometerMainActivity.this) 175 .withActivity(CollPedometerMainActivity.this)
163 .getPermissions(CollPedometerMainActivity.this 176 .getPermissions(CollPedometerMainActivity.this
164 , 100 177 , 100
165 - , Manifest.permission.INTERNET  
166 - , Manifest.permission.READ_EXTERNAL_STORAGE  
167 - , Manifest.permission.WRITE_EXTERNAL_STORAGE  
168 - , Manifest.permission.ACCESS_FINE_LOCATION  
169 - , Manifest.permission.ACCESS_COARSE_LOCATION 178 + , permissions
170 ); 179 );
171 // .getPermissionsWithTips(MainActivity.this 180 // .getPermissionsWithTips(MainActivity.this
172 // ,100 181 // ,100
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/StartCollectTraceActivity.java
  View file @d519e4b
@@ -6,6 +6,7 @@ import android.content.Context; @@ -6,6 +6,7 @@ import android.content.Context;
6 import android.content.Intent; 6 import android.content.Intent;
7 import android.content.pm.PackageManager; 7 import android.content.pm.PackageManager;
8 import android.net.Uri; 8 import android.net.Uri;
  9 +import android.os.Build;
9 import android.os.Bundle; 10 import android.os.Bundle;
10 import android.provider.Settings; 11 import android.provider.Settings;
11 import android.support.annotation.NonNull; 12 import android.support.annotation.NonNull;
@@ -106,6 +107,19 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity { @@ -106,6 +107,19 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity {
106 if (1 == permissionRequestCount) { 107 if (1 == permissionRequestCount) {
107 return; 108 return;
108 } 109 }
  110 + String[] permissions = null;
  111 + if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
  112 + permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
  113 + Manifest.permission.WRITE_EXTERNAL_STORAGE,
  114 + Manifest.permission.ACCESS_FINE_LOCATION,
  115 + Manifest.permission.ACCESS_COARSE_LOCATION};
  116 + } else {
  117 + permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
  118 + Manifest.permission.WRITE_EXTERNAL_STORAGE,
  119 + Manifest.permission.ACCESS_FINE_LOCATION,
  120 + Manifest.permission.ACCESS_COARSE_LOCATION,
  121 + Manifest.permission.ACCESS_BACKGROUND_LOCATION};
  122 + }
109 mPermissionsUtils 123 mPermissionsUtils
110 .setPermissionsListener(new PermissionsListener() { 124 .setPermissionsListener(new PermissionsListener() {
111 @Override 125 @Override
@@ -134,11 +148,7 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity { @@ -134,11 +148,7 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity {
134 .withActivity(StartCollectTraceActivity.this) 148 .withActivity(StartCollectTraceActivity.this)
135 .getPermissions(StartCollectTraceActivity.this 149 .getPermissions(StartCollectTraceActivity.this
136 , 100 150 , 100
137 - , Manifest.permission.INTERNET  
138 - , Manifest.permission.READ_EXTERNAL_STORAGE  
139 - , Manifest.permission.WRITE_EXTERNAL_STORAGE  
140 - , Manifest.permission.ACCESS_FINE_LOCATION  
141 - , Manifest.permission.ACCESS_COARSE_LOCATION 151 + , permissions
142 ); 152 );
143 // .getPermissionsWithTips(MainActivity.this 153 // .getPermissionsWithTips(MainActivity.this
144 // ,100 154 // ,100
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
  View file @d519e4b
@@ -6,6 +6,7 @@ import android.content.Context; @@ -6,6 +6,7 @@ import android.content.Context;
6 import android.content.Intent; 6 import android.content.Intent;
7 import android.content.pm.PackageManager; 7 import android.content.pm.PackageManager;
8 import android.net.Uri; 8 import android.net.Uri;
  9 +import android.os.Build;
9 import android.os.Bundle; 10 import android.os.Bundle;
10 import android.provider.Settings; 11 import android.provider.Settings;
11 import android.support.annotation.NonNull; 12 import android.support.annotation.NonNull;
@@ -243,6 +244,19 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity { @@ -243,6 +244,19 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
243 if (1 == permissionRequestCount) { 244 if (1 == permissionRequestCount) {
244 return; 245 return;
245 } 246 }
  247 + String[] permissions = null;
  248 + if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
  249 + permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
  250 + Manifest.permission.WRITE_EXTERNAL_STORAGE,
  251 + Manifest.permission.ACCESS_FINE_LOCATION,
  252 + Manifest.permission.ACCESS_COARSE_LOCATION};
  253 + } else {
  254 + permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
  255 + Manifest.permission.WRITE_EXTERNAL_STORAGE,
  256 + Manifest.permission.ACCESS_FINE_LOCATION,
  257 + Manifest.permission.ACCESS_COARSE_LOCATION,
  258 + Manifest.permission.ACCESS_BACKGROUND_LOCATION};
  259 + }
246 mPermissionsUtils 260 mPermissionsUtils
247 .setPermissionsListener(new PermissionsListener() { 261 .setPermissionsListener(new PermissionsListener() {
248 @Override 262 @Override
@@ -262,11 +276,7 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity { @@ -262,11 +276,7 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
262 .withActivity(RunRaceDetailActivity.this) 276 .withActivity(RunRaceDetailActivity.this)
263 .getPermissions(RunRaceDetailActivity.this 277 .getPermissions(RunRaceDetailActivity.this
264 , 100 278 , 100
265 - , Manifest.permission.INTERNET  
266 - , Manifest.permission.READ_EXTERNAL_STORAGE  
267 - , Manifest.permission.WRITE_EXTERNAL_STORAGE  
268 - , Manifest.permission.ACCESS_FINE_LOCATION  
269 - , Manifest.permission.ACCESS_COARSE_LOCATION 279 + , permissions
270 ); 280 );
271 // .getPermissionsWithTips(MainActivity.this 281 // .getPermissionsWithTips(MainActivity.this
272 // ,100 282 // ,100