CNLive Android Team / ModulePedometer · Commits

Commit 7e4b81d9c1eae695ed0aec8dbae021aeec3878d4

Authored by 朱显松
1 parent 76414c28

1.Android 12 快速定位传感器权限申请

Inline Side-by-side
Showing 5 changed files with 30 additions and 6 deletions
build.gradle
  View file @7e4b81d
@@ -45,10 +45,10 @@ ext { @@ -45,10 +45,10 @@ ext {
45 versionCode = versionMajor * 1000 + versionMinor * 100 + versionPatch * 10 + versionBuild 45 versionCode = versionMajor * 1000 + versionMinor * 100 + versionPatch * 10 + versionBuild
46 versionName = "${versionMajor}.${versionMinor}.${versionPatch}.${versionBuild}" 46 versionName = "${versionMajor}.${versionMinor}.${versionPatch}.${versionBuild}"
47 47
48 - compileSdkVersion = 29 48 + compileSdkVersion = 31
49 buildToolsVersion = "29.0.2" 49 buildToolsVersion = "29.0.2"
50 minSdkVersion = 19 50 minSdkVersion = 19
51 - targetSdkVersion = 29 51 + targetSdkVersion = 31
52 52
53 libNewMediaPicker = '1.0.1.8' 53 libNewMediaPicker = '1.0.1.8'
54 appArch = '1.3.6.2-androidx-beta1' 54 appArch = '1.3.6.2-androidx-beta1'
config.gradle
  View file @7e4b81d
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "1.3.6", 24 + version: "1.3.7",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollPedometerMainActivity.java
  View file @7e4b81d
@@ -136,13 +136,21 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity { @@ -136,13 +136,21 @@ public class CollPedometerMainActivity extends QMUIFragmentActivity {
136 Manifest.permission.WRITE_EXTERNAL_STORAGE, 136 Manifest.permission.WRITE_EXTERNAL_STORAGE,
137 Manifest.permission.ACCESS_FINE_LOCATION, 137 Manifest.permission.ACCESS_FINE_LOCATION,
138 Manifest.permission.ACCESS_COARSE_LOCATION}; 138 Manifest.permission.ACCESS_COARSE_LOCATION};
139 - } else { 139 + } else if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
140 permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, 140 permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
141 Manifest.permission.WRITE_EXTERNAL_STORAGE, 141 Manifest.permission.WRITE_EXTERNAL_STORAGE,
142 Manifest.permission.ACCESS_FINE_LOCATION, 142 Manifest.permission.ACCESS_FINE_LOCATION,
143 Manifest.permission.ACCESS_COARSE_LOCATION, 143 Manifest.permission.ACCESS_COARSE_LOCATION,
144 Manifest.permission.ACCESS_BACKGROUND_LOCATION, 144 Manifest.permission.ACCESS_BACKGROUND_LOCATION,
145 Manifest.permission.ACTIVITY_RECOGNITION}; 145 Manifest.permission.ACTIVITY_RECOGNITION};
  146 + } else {
  147 + permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
  148 + Manifest.permission.WRITE_EXTERNAL_STORAGE,
  149 + Manifest.permission.ACCESS_FINE_LOCATION,
  150 + Manifest.permission.ACCESS_COARSE_LOCATION,
  151 + Manifest.permission.ACCESS_BACKGROUND_LOCATION,
  152 + Manifest.permission.ACTIVITY_RECOGNITION,
  153 + Manifest.permission.HIGH_SAMPLING_RATE_SENSORS};
146 } 154 }
147 mPermissionsUtils 155 mPermissionsUtils
148 .setPermissionsListener(new PermissionsListener() { 156 .setPermissionsListener(new PermissionsListener() {
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/StartCollectTraceActivity.java
  View file @7e4b81d
@@ -112,13 +112,21 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity { @@ -112,13 +112,21 @@ public class StartCollectTraceActivity extends QMUIFragmentActivity {
112 Manifest.permission.WRITE_EXTERNAL_STORAGE, 112 Manifest.permission.WRITE_EXTERNAL_STORAGE,
113 Manifest.permission.ACCESS_FINE_LOCATION, 113 Manifest.permission.ACCESS_FINE_LOCATION,
114 Manifest.permission.ACCESS_COARSE_LOCATION}; 114 Manifest.permission.ACCESS_COARSE_LOCATION};
115 - } else { 115 + } else if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
116 permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, 116 permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
117 Manifest.permission.WRITE_EXTERNAL_STORAGE, 117 Manifest.permission.WRITE_EXTERNAL_STORAGE,
118 Manifest.permission.ACCESS_FINE_LOCATION, 118 Manifest.permission.ACCESS_FINE_LOCATION,
119 Manifest.permission.ACCESS_COARSE_LOCATION, 119 Manifest.permission.ACCESS_COARSE_LOCATION,
120 Manifest.permission.ACCESS_BACKGROUND_LOCATION, 120 Manifest.permission.ACCESS_BACKGROUND_LOCATION,
121 Manifest.permission.ACTIVITY_RECOGNITION}; 121 Manifest.permission.ACTIVITY_RECOGNITION};
  122 + } else {
  123 + permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
  124 + Manifest.permission.WRITE_EXTERNAL_STORAGE,
  125 + Manifest.permission.ACCESS_FINE_LOCATION,
  126 + Manifest.permission.ACCESS_COARSE_LOCATION,
  127 + Manifest.permission.ACCESS_BACKGROUND_LOCATION,
  128 + Manifest.permission.ACTIVITY_RECOGNITION,
  129 + Manifest.permission.HIGH_SAMPLING_RATE_SENSORS};
122 } 130 }
123 mPermissionsUtils 131 mPermissionsUtils
124 .setPermissionsListener(new PermissionsListener() { 132 .setPermissionsListener(new PermissionsListener() {
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
  View file @7e4b81d
@@ -235,13 +235,21 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity { @@ -235,13 +235,21 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
235 Manifest.permission.WRITE_EXTERNAL_STORAGE, 235 Manifest.permission.WRITE_EXTERNAL_STORAGE,
236 Manifest.permission.ACCESS_FINE_LOCATION, 236 Manifest.permission.ACCESS_FINE_LOCATION,
237 Manifest.permission.ACCESS_COARSE_LOCATION}; 237 Manifest.permission.ACCESS_COARSE_LOCATION};
238 - } else { 238 + } else if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
239 permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, 239 permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
240 Manifest.permission.WRITE_EXTERNAL_STORAGE, 240 Manifest.permission.WRITE_EXTERNAL_STORAGE,
241 Manifest.permission.ACCESS_FINE_LOCATION, 241 Manifest.permission.ACCESS_FINE_LOCATION,
242 Manifest.permission.ACCESS_COARSE_LOCATION, 242 Manifest.permission.ACCESS_COARSE_LOCATION,
243 Manifest.permission.ACCESS_BACKGROUND_LOCATION, 243 Manifest.permission.ACCESS_BACKGROUND_LOCATION,
244 Manifest.permission.ACTIVITY_RECOGNITION}; 244 Manifest.permission.ACTIVITY_RECOGNITION};
  245 + } else {
  246 + permissions = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
  247 + Manifest.permission.WRITE_EXTERNAL_STORAGE,
  248 + Manifest.permission.ACCESS_FINE_LOCATION,
  249 + Manifest.permission.ACCESS_COARSE_LOCATION,
  250 + Manifest.permission.ACCESS_BACKGROUND_LOCATION,
  251 + Manifest.permission.ACTIVITY_RECOGNITION,
  252 + Manifest.permission.HIGH_SAMPLING_RATE_SENSORS};
245 } 253 }
246 mPermissionsUtils 254 mPermissionsUtils
247 .setPermissionsListener(new PermissionsListener() { 255 .setPermissionsListener(new PermissionsListener() {