升级API到29，改为支持androidx库，定位改为精准定位

IanBUK · Dec 17, 2020 · 431011d · 431011d
1 parent 3bea02a
commit 431011d
Show file tree

Hide file tree

Showing 40 changed files with 193 additions and 266 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,21 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.0"
 
     defaultConfig {
         applicationId "com.moko.beacon"
         minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 12
-        versionName "1.3.6"
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                includeCompileClasspath = true
-            }
-        }
+        targetSdkVersion 29
+        versionCode 13
+        versionName "1.3.7"
     }
 
     buildTypes {
@@ -29,17 +23,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    signingConfigs {
-        debug {
-            v1SigningEnabled true
-            v2SigningEnabled true
-        }
-        release {
-            v1SigningEnabled true
-            v2SigningEnabled true
-        }
-    }
-
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
             def outputFile = output.outputFile
@@ -55,21 +38,13 @@ android {
     }
 }
 
-configurations.all {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        def requested = details.requested
-        if (requested.group == 'com.android.support') {
-            if (!requested.name.startsWith("multidex")) {
-                details.useVersion '28.0.0'
-            }
-        }
-    }
-}
-
 dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
-    implementation 'com.jakewharton:butterknife:7.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    // Butter Knife
+    implementation 'com.jakewharton:butterknife:10.2.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.github.GrenderG:Toasty:1.4.1'
     implementation project(path: ':mokosupport')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -103,7 +103,7 @@
 
         <service android:name=".service.DfuService" />
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="com.moko.beacon.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">

diff --git a/app/src/main/java/com/moko/beacon/BaseApplication.java b/app/src/main/java/com/moko/beacon/BaseApplication.java
@@ -1,13 +1,11 @@
 package com.moko.beacon;
 
 import android.app.Application;
-import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 
 import com.moko.beacon.utils.IOUtils;
 import com.moko.support.MokoSupport;
-import com.moko.support.log.LogModule;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

diff --git a/app/src/main/java/com/moko/beacon/activity/AboutActivity.java b/app/src/main/java/com/moko/beacon/activity/AboutActivity.java
@@ -3,14 +3,14 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
 import com.moko.beacon.R;
 import com.moko.beacon.utils.Utils;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -21,7 +21,7 @@
  * @ClassPath com.moko.beacon.activity.AboutActivity
  */
 public class AboutActivity extends BaseActivity {
-    @Bind(R.id.tv_soft_version)
+    @BindView(R.id.tv_soft_version)
     TextView tvSoftVersion;
 
     @Override

diff --git a/app/src/main/java/com/moko/beacon/activity/BaseActivity.java b/app/src/main/java/com/moko/beacon/activity/BaseActivity.java
@@ -6,11 +6,12 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.content.ContextCompat;
 
 import com.moko.support.log.LogModule;
 
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentActivity;
+
 
 public class BaseActivity extends FragmentActivity {
 
@@ -56,6 +57,6 @@ public boolean isWriteStoragePermissionOpen() {
     }
 
     public boolean isLocationPermissionOpen() {
-        return ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED;
+        return ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
     }
 }
diff --git a/app/src/main/java/com/moko/beacon/activity/DeviceInfoActivity.java b/app/src/main/java/com/moko/beacon/activity/DeviceInfoActivity.java
@@ -4,19 +4,13 @@
 import android.bluetooth.BluetoothAdapter;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.ServiceConnection;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.IBinder;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
@@ -36,7 +30,6 @@
 import com.moko.support.MokoConstants;
 import com.moko.support.MokoSupport;
 import com.moko.support.OrderTaskAssembler;
-import com.moko.support.entity.ConfigKeyEnum;
 import com.moko.support.entity.OrderType;
 import com.moko.support.event.ConnectStatusEvent;
 import com.moko.support.event.OrderTaskResponseEvent;
@@ -54,7 +47,10 @@
 import java.util.Arrays;
 import java.util.List;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import no.nordicsemi.android.dfu.DfuLogListener;
@@ -73,33 +69,33 @@ public class DeviceInfoActivity extends BaseActivity {
 
     public static final int REQUEST_CODE_SELECT_FIRMWARE = 0x10;
 
-    @Bind(R.id.tv_conn_state)
+    @BindView(R.id.tv_conn_state)
     TextView tvConnState;
-    @Bind(R.id.tv_ibeacon_battery)
+    @BindView(R.id.tv_ibeacon_battery)
     TextView tvIbeaconBattery;
-    @Bind(R.id.tv_ibeacon_uuid)
+    @BindView(R.id.tv_ibeacon_uuid)
     TextView tvIbeaconUuid;
-    @Bind(R.id.tv_ibeacon_major)
+    @BindView(R.id.tv_ibeacon_major)
     TextView tvIbeaconMajor;
-    @Bind(R.id.tv_ibeacon_minor)
+    @BindView(R.id.tv_ibeacon_minor)
     TextView tvIbeaconMinor;
-    @Bind(R.id.tv_ibeacon_measure_power)
+    @BindView(R.id.tv_ibeacon_measure_power)
     TextView tvIbeaconMeasurePower;
-    @Bind(R.id.tv_ibeacon_transmission)
+    @BindView(R.id.tv_ibeacon_transmission)
     TextView tvIbeaconTransmission;
-    @Bind(R.id.tv_ibeacon_broadcasting_interval)
+    @BindView(R.id.tv_ibeacon_broadcasting_interval)
     TextView tvIbeaconBroadcastingInterval;
-    @Bind(R.id.tv_ibeacon_serialID)
+    @BindView(R.id.tv_ibeacon_serialID)
     TextView tvIbeaconSerialID;
-    @Bind(R.id.tv_ibeacon_mac)
+    @BindView(R.id.tv_ibeacon_mac)
     TextView tvIbeaconMac;
-    @Bind(R.id.tv_ibeacon_device_name)
+    @BindView(R.id.tv_ibeacon_device_name)
     TextView tvIbeaconDeviceName;
-    @Bind(R.id.iv_ibeacon_device_conn_mode)
+    @BindView(R.id.iv_ibeacon_device_conn_mode)
     ImageView ivIbeaconDeviceConnMode;
-    @Bind(R.id.rl_ibeacon_three_axis)
+    @BindView(R.id.rl_ibeacon_three_axis)
     RelativeLayout rlIbeaconThreeAxis;
-    @Bind(R.id.view_cover)
+    @BindView(R.id.view_cover)
     View viewCover;
     private BeaconParam mBeaconParam;
 

diff --git a/app/src/main/java/com/moko/beacon/activity/GuideActivity.java b/app/src/main/java/com/moko/beacon/activity/GuideActivity.java
@@ -12,12 +12,13 @@
 import android.os.Bundle;
 import android.os.Process;
 import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
 
 import com.moko.beacon.BeaconConstants;
 import com.moko.beacon.R;
 import com.moko.beacon.utils.Utils;
 
+import androidx.core.app.ActivityCompat;
+
 /**
  * @Date 2017/12/7 0007
  * @Author wenzheng.liu
@@ -79,13 +80,13 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
                         // 判断用户是否 点击了不再提醒。(检测该权限是否还可以申请)
                         boolean shouldShowRequest = shouldShowRequestPermissionRationale(permissions[0]);
                         if (shouldShowRequest) {
-                            if (permissions[0].equals(Manifest.permission.ACCESS_COARSE_LOCATION)) {
+                            if (permissions[0].equals(Manifest.permission.ACCESS_FINE_LOCATION)) {
                                 showRequestPermissionDialog2();
                             } else {
                                 showRequestPermissionDialog();
                             }
                         } else {
-                            if (permissions[0].equals(Manifest.permission.ACCESS_COARSE_LOCATION)) {
+                            if (permissions[0].equals(Manifest.permission.ACCESS_FINE_LOCATION)) {
                                 showOpenSettingsDialog2();
                             } else {
                                 showOpenSettingsDialog();
@@ -110,7 +111,7 @@ private void delayGotoMain() {
                 return;
             } else {
                 AppOpsManager appOpsManager = (AppOpsManager) getSystemService(Context.APP_OPS_SERVICE);
-                int checkOp = appOpsManager.checkOp(AppOpsManager.OPSTR_COARSE_LOCATION, Process.myUid(), getPackageName());
+                int checkOp = appOpsManager.checkOp(AppOpsManager.OPSTR_FINE_LOCATION, Process.myUid(), getPackageName());
                 if (checkOp != AppOpsManager.MODE_ALLOWED) {
                     showOpenSettingsDialog2();
                     return;
@@ -235,7 +236,7 @@ private void showRequestPermissionDialog2() {
                 .setPositiveButton(getString(R.string.ensure), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        ActivityCompat.requestPermissions(GuideActivity.this, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, BeaconConstants.PERMISSION_REQUEST_CODE);
+                        ActivityCompat.requestPermissions(GuideActivity.this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, BeaconConstants.PERMISSION_REQUEST_CODE);
                     }
                 })
                 .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {

diff --git a/app/src/main/java/com/moko/beacon/activity/MainActivity.java b/app/src/main/java/com/moko/beacon/activity/MainActivity.java
@@ -8,7 +8,6 @@
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.annotation.IdRes;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -61,7 +60,8 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
-import butterknife.Bind;
+import androidx.annotation.IdRes;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -77,21 +77,21 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh
     public static final int SORT_TYPE_MAJOR = 1;
     public static final int SORT_TYPE_MINOR = 2;
 
-    @Bind(R.id.et_device_filter)
+    @BindView(R.id.et_device_filter)
     EditText etDeviceFilter;
-    @Bind(R.id.rb_sort_rssi)
+    @BindView(R.id.rb_sort_rssi)
     RadioButton rbSortRssi;
-    @Bind(R.id.rb_sort_major)
+    @BindView(R.id.rb_sort_major)
     RadioButton rbSortMajor;
-    @Bind(R.id.rb_sort_minor)
+    @BindView(R.id.rb_sort_minor)
     RadioButton rbSortMinor;
-    @Bind(R.id.rg_device_sort)
+    @BindView(R.id.rg_device_sort)
     RadioGroup rgDeviceSort;
-    @Bind(R.id.lv_device_list)
+    @BindView(R.id.lv_device_list)
     ListView lvDeviceList;
-    @Bind(R.id.iv_refresh)
+    @BindView(R.id.iv_refresh)
     ImageView ivRefresh;
-    @Bind(R.id.tv_devices_title)
+    @BindView(R.id.tv_devices_title)
     TextView tvDevicesTitle;
 
 

diff --git a/app/src/main/java/com/moko/beacon/activity/SetBroadcastIntervalActivity.java b/app/src/main/java/com/moko/beacon/activity/SetBroadcastIntervalActivity.java
@@ -2,8 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
@@ -26,7 +24,9 @@
 
 import java.util.ArrayList;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -38,27 +38,27 @@
  */
 public class SetBroadcastIntervalActivity extends BaseActivity {
 
-    @Bind(R.id.tv_broadcast_interval_1)
+    @BindView(R.id.tv_broadcast_interval_1)
     TextView tvBroadcastInterval1;
-    @Bind(R.id.tv_broadcast_interval_2)
+    @BindView(R.id.tv_broadcast_interval_2)
     TextView tvBroadcastInterval2;
-    @Bind(R.id.tv_broadcast_interval_3)
+    @BindView(R.id.tv_broadcast_interval_3)
     TextView tvBroadcastInterval3;
-    @Bind(R.id.tv_broadcast_interval_4)
+    @BindView(R.id.tv_broadcast_interval_4)
     TextView tvBroadcastInterval4;
-    @Bind(R.id.tv_broadcast_interval_5)
+    @BindView(R.id.tv_broadcast_interval_5)
     TextView tvBroadcastInterval5;
-    @Bind(R.id.tv_broadcast_interval_6)
+    @BindView(R.id.tv_broadcast_interval_6)
     TextView tvBroadcastInterval6;
-    @Bind(R.id.tv_broadcast_interval_7)
+    @BindView(R.id.tv_broadcast_interval_7)
     TextView tvBroadcastInterval7;
-    @Bind(R.id.tv_broadcast_interval_8)
+    @BindView(R.id.tv_broadcast_interval_8)
     TextView tvBroadcastInterval8;
-    @Bind(R.id.tv_broadcast_interval_9)
+    @BindView(R.id.tv_broadcast_interval_9)
     TextView tvBroadcastInterval9;
-    @Bind(R.id.tv_broadcast_interval_10)
+    @BindView(R.id.tv_broadcast_interval_10)
     TextView tvBroadcastInterval10;
-    @Bind(R.id.et_broadcast_interval)
+    @BindView(R.id.et_broadcast_interval)
     EditText etBroadcastInterval;
     private ArrayList<View> mViews;