From eadc419e66779f9bd51da4f81e5300edef3e4de1 Mon Sep 17 00:00:00 2001
From: xtc <tcymac@126.com>
Date: Tue, 1 Nov 2022 09:18:22 +0800
Subject: [PATCH] compatible with android 12

---
 .idea/misc.xml                                |  2 +-
 app/build.gradle                              |  4 +-
 app/src/main/AndroidManifest.xml              | 22 +++++++++-
 .../main/java/ttlock/demo/MainActivity.java   |  6 +++
 .../ttlock/demo/lock/ScanLockActivity.java    | 14 +++++--
 .../main/java/ttlock/demo/utils/AppUtil.java  | 40 +++++++++++++++++++
 build.gradle                                  |  6 +--
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 8 files changed, 85 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/java/ttlock/demo/utils/AppUtil.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7a0e8d9..758b48d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -43,7 +43,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 2a681f9..2fad26c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
     defaultConfig {
         applicationId "ttlock.demo"
         minSdkVersion 23
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 64fd03a..dafaf41 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,13 +3,31 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="ttlock.demo">
 
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+    <!--
+Needed only if your app looks for Bluetooth devices.
+      You must add an attribute to this permission, or declare the
+      ACCESS_FINE_LOCATION permission, depending on the results when you
+      check location usage in your app.
+ -->
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation"
+        tools:targetApi="s" />
+    <!--
+ Needed only if your app communicates with already-paired Bluetooth
+         devices.
+    -->
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+
     <application
         android:name=".MyApplication"
         tools:replace="android:allowBackup"
diff --git a/app/src/main/java/ttlock/demo/MainActivity.java b/app/src/main/java/ttlock/demo/MainActivity.java
index 715d5e5..53ca4af 100644
--- a/app/src/main/java/ttlock/demo/MainActivity.java
+++ b/app/src/main/java/ttlock/demo/MainActivity.java
@@ -1,6 +1,8 @@
 package ttlock.demo;
 
 import androidx.databinding.DataBindingUtil;
+
+import android.Manifest;
 import android.os.Bundle;
 
 import ttlock.demo.databinding.ActivityMainBinding;
@@ -9,6 +11,7 @@
 import ttlock.demo.iccard.ICCardActivity;
 import ttlock.demo.lock.LockApiActivity;
 import ttlock.demo.passcode.PasscodeActivity;
+import ttlock.demo.utils.AppUtil;
 import ttlock.demo.wireless_keyboard.WirelessKeyboardActivity;
 
 ;
@@ -21,6 +24,9 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = DataBindingUtil.setContentView(this,R.layout.activity_main);
         initListener();
+        if (AppUtil.isAndroid12OrOver()) {
+            AppUtil.checkPermission(this, Manifest.permission.BLUETOOTH_CONNECT);
+        }
     }
 
     private void initListener(){
diff --git a/app/src/main/java/ttlock/demo/lock/ScanLockActivity.java b/app/src/main/java/ttlock/demo/lock/ScanLockActivity.java
index a880b5c..88a86fa 100644
--- a/app/src/main/java/ttlock/demo/lock/ScanLockActivity.java
+++ b/app/src/main/java/ttlock/demo/lock/ScanLockActivity.java
@@ -32,6 +32,7 @@
 import ttlock.demo.lock.model.LockInitResultObj;
 import ttlock.demo.retrofit.ApiService;
 import ttlock.demo.retrofit.RetrofitAPIManager;
+import ttlock.demo.utils.AppUtil;
 
 public class ScanLockActivity extends BaseActivity implements LockListAdapter.onLockItemClick{
     ActivityScanLockBinding binding;
@@ -88,9 +89,16 @@ private void initListener(){
      */
     @TargetApi(Build.VERSION_CODES.M)
     private void startScan(){
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-            requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, REQUEST_PERMISSION_REQ_CODE);
-            return;
+        if (AppUtil.isAndroid12OrOver()) {//android 12 needs BLUETOOTH_SCAN permission
+            if (ContextCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) != PackageManager.PERMISSION_GRANTED) {
+                requestPermissions(new String[]{Manifest.permission.BLUETOOTH_SCAN}, REQUEST_PERMISSION_REQ_CODE);
+                return;
+            }
+        } else {
+            if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+                requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, REQUEST_PERMISSION_REQ_CODE);
+                return;
+            }
         }
 
         getScanLockCallback();
diff --git a/app/src/main/java/ttlock/demo/utils/AppUtil.java b/app/src/main/java/ttlock/demo/utils/AppUtil.java
new file mode 100644
index 0000000..db937f9
--- /dev/null
+++ b/app/src/main/java/ttlock/demo/utils/AppUtil.java
@@ -0,0 +1,40 @@
+package ttlock.demo.utils;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Build;
+
+import androidx.core.content.ContextCompat;
+
+public class AppUtil {
+    public static final int REQUEST_PERMISSION_REQ_CODE = 1;
+
+    public static boolean isAndroid12OrOver() {
+        if (getAndroidSDKVersion() >= 31) {
+            return true;
+        }
+        return false;
+    }
+
+    public static int getAndroidSDKVersion() {
+        int version = 0;
+        try {
+            version = Integer.valueOf(Build.VERSION.SDK_INT);
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
+        return version;
+    }
+
+    public static boolean checkPermission(Activity activity, String permission) {
+        if (ContextCompat.checkSelfPermission(activity, permission) != PackageManager.PERMISSION_GRANTED) {
+            activity.requestPermissions(new String[]{permission}, REQUEST_PERMISSION_REQ_CODE);
+            return false;
+        }
+        return true;
+    }
+
+
+}
diff --git a/build.gradle b/build.gradle
index 7536b9b..cafa0ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,9 +30,9 @@ ext {
     // Sdk and tools
     // Support library and architecture components support minSdk 14 and above.
     minSdkVersion = 18
-    targetSdkVersion = 23
-    compileSdkVersion = 28
-    buildToolsVersion = '28.0.3'
+    targetSdkVersion = 31
+    compileSdkVersion = 31
+    buildToolsVersion = '31.0.0'
     // App dependencies
     supportLibraryVersion = '28.0.0'
     lifecycle_version = "1.1.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 836a757..eb7cf31 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Nov 29 12:55:43 CST 2019
+#Tue Oct 18 16:32:06 CST 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip