diff --git a/app/build.gradle b/app/build.gradle
index 5e769e9..d81068f 100644
--- 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
index 3cc8920..e8a8a12 100644
--- 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
index 9fd7c21..0600a24 100644
--- 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
index 2414a28..0cc188c 100644
--- 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
index 3b1425d..f1121b2 100644
--- 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
index defef9c..18ab49d 100644
--- 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
index 0cd5cb3..c8330d4 100644
--- 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
index 498bb19..daf1864 100644
--- 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
index 4ae36b1..acc4f94 100644
--- 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;
 
diff --git a/app/src/main/java/com/moko/beacon/activity/SetConnectionModeActivity.java b/app/src/main/java/com/moko/beacon/activity/SetConnectionModeActivity.java
index 2fe6134..19f0a5c 100644
--- a/app/src/main/java/com/moko/beacon/activity/SetConnectionModeActivity.java
+++ b/app/src/main/java/com/moko/beacon/activity/SetConnectionModeActivity.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.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -26,7 +24,9 @@
 
 import java.util.HashMap;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -38,13 +38,13 @@
  */
 public class SetConnectionModeActivity extends BaseActivity {
 
-    @Bind(R.id.iv_conn_yes)
+    @BindView(R.id.iv_conn_yes)
     ImageView ivConnYes;
-    @Bind(R.id.rl_conn_yes)
+    @BindView(R.id.rl_conn_yes)
     RelativeLayout rlConnYes;
-    @Bind(R.id.iv_conn_no)
+    @BindView(R.id.iv_conn_no)
     ImageView ivConnNo;
-    @Bind(R.id.rl_conn_no)
+    @BindView(R.id.rl_conn_no)
     RelativeLayout rlConnNo;
     private HashMap<ViewGroup, View> viewHashMap;
     private String connectMode;
diff --git a/app/src/main/java/com/moko/beacon/activity/SetDeviceIdActivity.java b/app/src/main/java/com/moko/beacon/activity/SetDeviceIdActivity.java
index 104697b..dc4610f 100644
--- a/app/src/main/java/com/moko/beacon/activity/SetDeviceIdActivity.java
+++ b/app/src/main/java/com/moko/beacon/activity/SetDeviceIdActivity.java
@@ -2,7 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
@@ -22,7 +21,8 @@
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -33,7 +33,7 @@
  * @ClassPath com.moko.beacon.activity.SetDeviceIdActivity
  */
 public class SetDeviceIdActivity extends BaseActivity {
-    @Bind(R.id.et_device_id)
+    @BindView(R.id.et_device_id)
     EditText etDeviceId;
 
     @Override
diff --git a/app/src/main/java/com/moko/beacon/activity/SetIBeaconNameActivity.java b/app/src/main/java/com/moko/beacon/activity/SetIBeaconNameActivity.java
index e3b83f5..6998bce 100644
--- a/app/src/main/java/com/moko/beacon/activity/SetIBeaconNameActivity.java
+++ b/app/src/main/java/com/moko/beacon/activity/SetIBeaconNameActivity.java
@@ -2,7 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.text.InputFilter;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -25,7 +24,8 @@
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -36,9 +36,9 @@
  * @ClassPath com.moko.beacon.activity.SetIBeaconNameActivity
  */
 public class SetIBeaconNameActivity extends BaseActivity {
-    @Bind(R.id.et_ibeacon_name)
+    @BindView(R.id.et_ibeacon_name)
     EditText etIBeaconName;
-    @Bind(R.id.tv_tips)
+    @BindView(R.id.tv_tips)
     TextView tvTips;
     private boolean isSupportThreeAxis;
     private final String FILTER_ASCII = "\\A\\p{ASCII}*\\z";
diff --git a/app/src/main/java/com/moko/beacon/activity/SetMajorActivity.java b/app/src/main/java/com/moko/beacon/activity/SetMajorActivity.java
index 632f8b3..07a2027 100644
--- a/app/src/main/java/com/moko/beacon/activity/SetMajorActivity.java
+++ b/app/src/main/java/com/moko/beacon/activity/SetMajorActivity.java
@@ -2,7 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -25,7 +24,8 @@
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -36,11 +36,11 @@
  * @ClassPath com.moko.beacon.activity.SetMajorActivity
  */
 public class SetMajorActivity extends BaseActivity {
-    @Bind(R.id.et_major)
+    @BindView(R.id.et_major)
     EditText etMajor;
-    @Bind(R.id.tv_decimalism)
+    @BindView(R.id.tv_decimalism)
     TextView tvDecimalism;
-    @Bind(R.id.tv_hexadecimal)
+    @BindView(R.id.tv_hexadecimal)
     TextView tvHexadecimal;
 
     @Override
diff --git a/app/src/main/java/com/moko/beacon/activity/SetMeasurePowerActivity.java b/app/src/main/java/com/moko/beacon/activity/SetMeasurePowerActivity.java
index 8df3517..dbb9925 100644
--- a/app/src/main/java/com/moko/beacon/activity/SetMeasurePowerActivity.java
+++ b/app/src/main/java/com/moko/beacon/activity/SetMeasurePowerActivity.java
@@ -2,7 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
@@ -22,7 +21,8 @@
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -33,7 +33,7 @@
  * @ClassPath com.moko.beacon.activity.SetMeasurePowerActivity
  */
 public class SetMeasurePowerActivity extends BaseActivity {
-    @Bind(R.id.et_measure_power)
+    @BindView(R.id.et_measure_power)
     EditText etMeasurePower;
 
     @Override
diff --git a/app/src/main/java/com/moko/beacon/activity/SetMinorActivity.java b/app/src/main/java/com/moko/beacon/activity/SetMinorActivity.java
index 6b8c15e..18c6929 100644
--- a/app/src/main/java/com/moko/beacon/activity/SetMinorActivity.java
+++ b/app/src/main/java/com/moko/beacon/activity/SetMinorActivity.java
@@ -2,7 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -25,7 +24,8 @@
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -36,11 +36,11 @@
  * @ClassPath com.moko.beacon.activity.SetMinorActivity
  */
 public class SetMinorActivity extends BaseActivity {
-    @Bind(R.id.et_minor)
+    @BindView(R.id.et_minor)
     EditText etMinor;
-    @Bind(R.id.tv_decimalism)
+    @BindView(R.id.tv_decimalism)
     TextView tvDecimalism;
-    @Bind(R.id.tv_hexadecimal)
+    @BindView(R.id.tv_hexadecimal)
     TextView tvHexadecimal;
 
     @Override
diff --git a/app/src/main/java/com/moko/beacon/activity/SetPasswordActivity.java b/app/src/main/java/com/moko/beacon/activity/SetPasswordActivity.java
index 1ed0a47..e0c60bc 100644
--- a/app/src/main/java/com/moko/beacon/activity/SetPasswordActivity.java
+++ b/app/src/main/java/com/moko/beacon/activity/SetPasswordActivity.java
@@ -2,7 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.text.InputFilter;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -24,7 +23,8 @@
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -37,9 +37,9 @@
 public class SetPasswordActivity extends BaseActivity {
 
 
-    @Bind(R.id.et_password)
+    @BindView(R.id.et_password)
     EditText etPassword;
-    @Bind(R.id.et_password_confirm)
+    @BindView(R.id.et_password_confirm)
     EditText etPasswordConfirm;
     private final String FILTER_ASCII = "\\A\\p{ASCII}*\\z";
 
diff --git a/app/src/main/java/com/moko/beacon/activity/SetTransmissionActivity.java b/app/src/main/java/com/moko/beacon/activity/SetTransmissionActivity.java
index d7756a2..f2b8fb6 100644
--- a/app/src/main/java/com/moko/beacon/activity/SetTransmissionActivity.java
+++ b/app/src/main/java/com/moko/beacon/activity/SetTransmissionActivity.java
@@ -1,15 +1,6 @@
 package com.moko.beacon.activity;
 
-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.os.Bundle;
-import android.os.IBinder;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
@@ -32,7 +23,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;
 
@@ -43,21 +36,21 @@
  * @ClassPath com.moko.beacon.activity.SetTransmissionActivity
  */
 public class SetTransmissionActivity extends BaseActivity {
-    @Bind(R.id.ll_transmission_grade_0)
+    @BindView(R.id.ll_transmission_grade_0)
     LinearLayout llTransmissionGrade0;
-    @Bind(R.id.ll_transmission_grade_1)
+    @BindView(R.id.ll_transmission_grade_1)
     LinearLayout llTransmissionGrade1;
-    @Bind(R.id.ll_transmission_grade_2)
+    @BindView(R.id.ll_transmission_grade_2)
     LinearLayout llTransmissionGrade2;
-    @Bind(R.id.ll_transmission_grade_3)
+    @BindView(R.id.ll_transmission_grade_3)
     LinearLayout llTransmissionGrade3;
-    @Bind(R.id.ll_transmission_grade_4)
+    @BindView(R.id.ll_transmission_grade_4)
     LinearLayout llTransmissionGrade4;
-    @Bind(R.id.ll_transmission_grade_5)
+    @BindView(R.id.ll_transmission_grade_5)
     LinearLayout llTransmissionGrade5;
-    @Bind(R.id.ll_transmission_grade_6)
+    @BindView(R.id.ll_transmission_grade_6)
     LinearLayout llTransmissionGrade6;
-    @Bind(R.id.ll_transmission_grade_7)
+    @BindView(R.id.ll_transmission_grade_7)
     LinearLayout llTransmissionGrade7;
     private int transmissionGrade;
     private ArrayList<ViewGroup> mViews;
diff --git a/app/src/main/java/com/moko/beacon/activity/SetUUIDActivity.java b/app/src/main/java/com/moko/beacon/activity/SetUUIDActivity.java
index c9993d4..d757125 100644
--- a/app/src/main/java/com/moko/beacon/activity/SetUUIDActivity.java
+++ b/app/src/main/java/com/moko/beacon/activity/SetUUIDActivity.java
@@ -2,7 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -31,7 +30,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -45,29 +45,29 @@ public class SetUUIDActivity extends BaseActivity {
 
     public static final String UUID_PATTERN = "[A-Fa-f0-9]{8}-(?:[A-Fa-f0-9]{4}-){3}[A-Fa-f0-9]{12}";
 
-    @Bind(R.id.et_seletced_uuid)
+    @BindView(R.id.et_seletced_uuid)
     EditText etSeletcedUuid;
-    @Bind(R.id.tv_airLocate_uuid)
+    @BindView(R.id.tv_airLocate_uuid)
     TextView tvAirLocateUuid;
-    @Bind(R.id.iv_airLocate_selected)
+    @BindView(R.id.iv_airLocate_selected)
     ImageView ivAirLocateSelected;
-    @Bind(R.id.tv_wechat_1_uuid)
+    @BindView(R.id.tv_wechat_1_uuid)
     TextView tvWechat1Uuid;
-    @Bind(R.id.iv_wechat_1_selected)
+    @BindView(R.id.iv_wechat_1_selected)
     ImageView ivWechat1Selected;
-    @Bind(R.id.tv_wechat_2_uuid)
+    @BindView(R.id.tv_wechat_2_uuid)
     TextView tvWechat2Uuid;
-    @Bind(R.id.iv_wechat_2_selected)
+    @BindView(R.id.iv_wechat_2_selected)
     ImageView ivWechat2Selected;
-    @Bind(R.id.tv_estimote_uuid)
+    @BindView(R.id.tv_estimote_uuid)
     TextView tvEstimoteUuid;
-    @Bind(R.id.iv_estimote_selected)
+    @BindView(R.id.iv_estimote_selected)
     ImageView ivEstimoteSelected;
-    @Bind(R.id.tv_uuid)
+    @BindView(R.id.tv_uuid)
     TextView tvUuid;
-    @Bind(R.id.iv_uuid_selected)
+    @BindView(R.id.iv_uuid_selected)
     ImageView ivUuidSelected;
-    @Bind(R.id.rl_uuid)
+    @BindView(R.id.rl_uuid)
     RelativeLayout rlUuid;
     private HashMap<Integer, View> mUUIDViews;
     private Pattern pattern;
diff --git a/app/src/main/java/com/moko/beacon/activity/SystemInfoActivity.java b/app/src/main/java/com/moko/beacon/activity/SystemInfoActivity.java
index 12347e7..fbd6a03 100644
--- a/app/src/main/java/com/moko/beacon/activity/SystemInfoActivity.java
+++ b/app/src/main/java/com/moko/beacon/activity/SystemInfoActivity.java
@@ -3,7 +3,6 @@
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.View;
@@ -31,7 +30,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -42,23 +42,23 @@
  * @ClassPath com.moko.beacon.activity.SystemInfoActivity
  */
 public class SystemInfoActivity extends BaseActivity {
-    @Bind(R.id.tv_ibeacon_soft_version)
+    @BindView(R.id.tv_ibeacon_soft_version)
     TextView tvIbeaconSoftVersion;
-    @Bind(R.id.tv_ibeacon_firmname)
+    @BindView(R.id.tv_ibeacon_firmname)
     TextView tvIbeaconFirmname;
-    @Bind(R.id.tv_ibeacon_device_name)
+    @BindView(R.id.tv_ibeacon_device_name)
     TextView tvIbeaconDeviceName;
-    @Bind(R.id.tv_ibeacon_date)
+    @BindView(R.id.tv_ibeacon_date)
     TextView tvIbeaconDate;
-    @Bind(R.id.tv_ibeacon_mac)
+    @BindView(R.id.tv_ibeacon_mac)
     TextView tvIbeaconMac;
-    @Bind(R.id.tv_ibeacon_chip_mode)
+    @BindView(R.id.tv_ibeacon_chip_mode)
     TextView tvIbeaconChipMode;
-    @Bind(R.id.tv_ibeacon_hardware_version)
+    @BindView(R.id.tv_ibeacon_hardware_version)
     TextView tvIbeaconHardwareVersion;
-    @Bind(R.id.tv_ibeacon_firmware_version)
+    @BindView(R.id.tv_ibeacon_firmware_version)
     TextView tvIbeaconFirmwareVersion;
-    @Bind(R.id.tv_ibeacon_runtime)
+    @BindView(R.id.tv_ibeacon_runtime)
     TextView tvIbeaconRuntime;
     private BeaconDeviceInfo mBeaconDeviceInfo;
 
diff --git a/app/src/main/java/com/moko/beacon/activity/ThreeAxesActivity.java b/app/src/main/java/com/moko/beacon/activity/ThreeAxesActivity.java
index f74d400..99076da 100644
--- a/app/src/main/java/com/moko/beacon/activity/ThreeAxesActivity.java
+++ b/app/src/main/java/com/moko/beacon/activity/ThreeAxesActivity.java
@@ -2,7 +2,6 @@
 
 import android.app.ProgressDialog;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
@@ -29,7 +28,8 @@
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
-import butterknife.Bind;
+import androidx.annotation.Nullable;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -41,11 +41,11 @@
  */
 public class ThreeAxesActivity extends BaseActivity {
 
-    @Bind(R.id.tv_device_three_axis)
+    @BindView(R.id.tv_device_three_axis)
     TextView tvDeviceThreeAxis;
-    @Bind(R.id.tv_stop)
+    @BindView(R.id.tv_stop)
     TextView tvStop;
-    @Bind(R.id.scroll_view)
+    @BindView(R.id.scroll_view)
     ScrollView scrollView;
     private StringBuilder builder;
     private SimpleDateFormat simpleDateFormat;
diff --git a/app/src/main/java/com/moko/beacon/adapter/BeaconListAdapter.java b/app/src/main/java/com/moko/beacon/adapter/BeaconListAdapter.java
index 4303614..642dd5d 100644
--- a/app/src/main/java/com/moko/beacon/adapter/BeaconListAdapter.java
+++ b/app/src/main/java/com/moko/beacon/adapter/BeaconListAdapter.java
@@ -11,7 +11,7 @@
 import com.moko.beacon.R;
 import com.moko.beacon.entity.BeaconInfo;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
@@ -71,27 +71,27 @@ protected ViewHolder createViewHolder(int position, LayoutInflater inflater, Vie
     }
 
     static class DeviceViewHolder extends ViewHolder {
-        @Bind(R.id.tv_device_name)
+        @BindView(R.id.tv_device_name)
         TextView tvDeviceName;
-        @Bind(R.id.iv_battery_power)
+        @BindView(R.id.iv_battery_power)
         ImageView ivBatteryPower;
-        @Bind(R.id.tv_device_rssi)
+        @BindView(R.id.tv_device_rssi)
         TextView tvDeviceRssi;
-        @Bind(R.id.tv_device_major)
+        @BindView(R.id.tv_device_major)
         TextView tvDeviceMajor;
-        @Bind(R.id.tv_device_minor)
+        @BindView(R.id.tv_device_minor)
         TextView tvDeviceMinor;
-        @Bind(R.id.tv_device_distane_desc)
+        @BindView(R.id.tv_device_distane_desc)
         TextView tvDeviceDistaneDesc;
-        @Bind(R.id.tv_device_conn_state)
+        @BindView(R.id.tv_device_conn_state)
         TextView tvDeviceConnState;
-        @Bind(R.id.tv_device_tx)
+        @BindView(R.id.tv_device_tx)
         TextView tvDeviceTx;
-        @Bind(R.id.tv_device_mac)
+        @BindView(R.id.tv_device_mac)
         TextView tvDeviceMac;
-        @Bind(R.id.tv_device_uuid)
+        @BindView(R.id.tv_device_uuid)
         TextView tvDeviceUuid;
-        @Bind(R.id.tv_device_three_axis)
+        @BindView(R.id.tv_device_three_axis)
         TextView tvDeviceThreeAxis;
 
         public DeviceViewHolder(View convertView) {
diff --git a/app/src/main/java/com/moko/beacon/dialog/BeaconAlertDialog.java b/app/src/main/java/com/moko/beacon/dialog/BeaconAlertDialog.java
index 226339a..17b53da 100644
--- a/app/src/main/java/com/moko/beacon/dialog/BeaconAlertDialog.java
+++ b/app/src/main/java/com/moko/beacon/dialog/BeaconAlertDialog.java
@@ -4,15 +4,14 @@
 import android.view.View;
 import android.widget.TextView;
 
-
 import com.moko.beacon.R;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.OnClick;
 
 public class BeaconAlertDialog extends BaseDialog<String> {
 
-    @Bind(R.id.tv_connect_alert)
+    @BindView(R.id.tv_connect_alert)
     TextView tvConnectAlert;
 
     public BeaconAlertDialog(Context context) {
diff --git a/app/src/main/java/com/moko/beacon/dialog/PasswordDialog.java b/app/src/main/java/com/moko/beacon/dialog/PasswordDialog.java
index c34050a..f7545b8 100644
--- a/app/src/main/java/com/moko/beacon/dialog/PasswordDialog.java
+++ b/app/src/main/java/com/moko/beacon/dialog/PasswordDialog.java
@@ -11,7 +11,7 @@
 import com.moko.beacon.R;
 import com.moko.beacon.utils.ToastUtils;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.OnClick;
 
 /**
@@ -21,7 +21,7 @@
  * @ClassPath com.moko.beacon.dialog.PasswordDialog
  */
 public class PasswordDialog extends BaseDialog {
-    @Bind(R.id.et_password)
+    @BindView(R.id.et_password)
     EditText etPassword;
     private String savedPassword;
     private final String FILTER_ASCII = "\\A\\p{ASCII}*\\z";
diff --git a/app/src/main/java/com/moko/beacon/utils/FileUtils.java b/app/src/main/java/com/moko/beacon/utils/FileUtils.java
index acbc80d..6ef8141 100644
--- a/app/src/main/java/com/moko/beacon/utils/FileUtils.java
+++ b/app/src/main/java/com/moko/beacon/utils/FileUtils.java
@@ -9,8 +9,6 @@
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -19,6 +17,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 public class FileUtils {
     /**
      * 专为Android4.4设计的从Uri获取文件绝对路径，以前的方法已不好使
diff --git a/app/src/main/java/com/moko/beacon/utils/ToastUtils.java b/app/src/main/java/com/moko/beacon/utils/ToastUtils.java
index 3297787..4c3a1ac 100644
--- a/app/src/main/java/com/moko/beacon/utils/ToastUtils.java
+++ b/app/src/main/java/com/moko/beacon/utils/ToastUtils.java
@@ -1,10 +1,11 @@
 package com.moko.beacon.utils;
 
 import android.content.Context;
-import android.text.TextUtils;
 import android.view.Gravity;
 import android.widget.Toast;
 
+import es.dmoral.toasty.Toasty;
+
 /**
  * toast方法
  * 
@@ -13,55 +14,15 @@
  */
 final public class ToastUtils {
 
-	public static final void showToast(Context context, String tip) {
-		showToast(context, tip, true);
-	}
-
-	public static final void showToast(Context context, int tipID) {
-		showToast(context, tipID, true);
-	}
-
-	public static final void showToast(Context context, int tipID,
-									   boolean isCenter) {
-		String tip = (String) context.getResources().getText(tipID);
-		showToast(context, tip, isCenter);
-	}
-
-	/**
-	 * toast n个字以上 LENGTH_LONG
-	 * 
-	 * @param context
-	 * @param tip
-	 * @param isCenter
-	 */
-	public static final void showToast(Context context, String tip,
-									   boolean isCenter) {
-		int duration = Toast.LENGTH_SHORT;
-		if (TextUtils.isEmpty(tip)) {
-			return;
-		}
-		if (tip.length() >= 15) {
-			duration = Toast.LENGTH_LONG;
-		}
-		Toast toast = Toast.makeText(context, tip, duration);
-		if (isCenter) {
-			toast.setGravity(Gravity.CENTER, 0, 0);
-		}
-		toast.show();
-	}
+    public static void showToast(Context context, int tipID) {
+        String tip = (String) context.getResources().getText(tipID);
+        showToast(context, tip);
+    }
 
-	/**
-	 * 
-	 * @Title: showInfo
-	 * @Description: 显示对话框
-	 * @param context
-	 * @param title
-	 * @param info
-	 * @return void
-	 * @throws
-	 */
-	public static final void showInfo(Context context, String title, String info) {
-		showToast(context, info, true);
-	}
+    public static void showToast(Context context, String tip) {
+        Toast toast = Toasty.normal(context, tip);
+        toast.setGravity(Gravity.CENTER, 0, 0);
+        toast.show();
+    }
 
 }
diff --git a/app/src/main/res/layout/activity_device_info.xml b/app/src/main/res/layout/activity_device_info.xml
index 165e546..b990ac7 100644
--- a/app/src/main/res/layout/activity_device_info.xml
+++ b/app/src/main/res/layout/activity_device_info.xml
@@ -48,7 +48,7 @@
         android:layout_weight="1.0"
         android:background="@color/white_ffffff">
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
@@ -541,6 +541,6 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
index b591253..a2fbb63 100644
--- a/app/src/main/res/xml/file_paths.xml
+++ b/app/src/main/res/xml/file_paths.xml
@@ -1,4 +1,4 @@
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
+<paths>
     <external-path name="log" path="mokoSupport/"/>
     <external-path name="*" path="."/>
 </paths>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 7233ea3..f2b498f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,12 +4,17 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.6.3'
     }
 }
 allprojects {
     repositories {
         jcenter()
         google()
+        maven { url "https://jitpack.io" }
     }
-}
\ No newline at end of file
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/gradle.properties b/gradle.properties
index b0b44ef..e001bcf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,3 +16,5 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 android.injected.testOnly=false
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3c04e2f..7f01bc3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
\ No newline at end of file
diff --git a/mokosupport/build.gradle b/mokosupport/build.gradle
index 9f65f6c..f008338 100644
--- a/mokosupport/build.gradle
+++ b/mokosupport/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.0'
 
     defaultConfig {
         minSdkVersion 18
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -19,9 +19,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api 'no.nordicsemi.android.support.v18:scanner:1.0.0'
-    implementation 'com.elvishew:xlog:1.3.0'
+    api 'no.nordicsemi.android.support.v18:scanner:1.4.3'
+    implementation 'com.elvishew:xlog:1.6.1'
     api 'no.nordicsemi.android:dfu:1.8.0'
     api 'org.greenrobot:eventbus:3.2.0'
     implementation 'no.nordicsemi.android:ble:2.0.5'
+    implementation 'androidx.core:core:1.3.1'
 }
diff --git a/mokosupport/src/main/AndroidManifest.xml b/mokosupport/src/main/AndroidManifest.xml
index 433bd50..a5ea904 100644
--- a/mokosupport/src/main/AndroidManifest.xml
+++ b/mokosupport/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <!-- 按时required为true时，则应用只能在支持BLE的Android设备上安装运行；required为false时，Android设备均可正常安装运行 -->
diff --git a/mokosupport/src/main/java/com/moko/support/MokoBleManager.java b/mokosupport/src/main/java/com/moko/support/MokoBleManager.java
index 861b36d..4bc101f 100644
--- a/mokosupport/src/main/java/com/moko/support/MokoBleManager.java
+++ b/mokosupport/src/main/java/com/moko/support/MokoBleManager.java
@@ -6,7 +6,6 @@
 import android.bluetooth.BluetoothGattDescriptor;
 import android.bluetooth.BluetoothGattService;
 import android.content.Context;
-import android.support.annotation.NonNull;
 
 import com.moko.support.callback.MokoResponseCallback;
 import com.moko.support.log.LogModule;
@@ -14,6 +13,7 @@
 
 import java.util.UUID;
 
+import androidx.annotation.NonNull;
 import no.nordicsemi.android.ble.BleManager;
 import no.nordicsemi.android.ble.BleManagerCallbacks;
 import no.nordicsemi.android.ble.callback.DataReceivedCallback;
diff --git a/mokosupport/src/main/java/com/moko/support/MokoSupport.java b/mokosupport/src/main/java/com/moko/support/MokoSupport.java
index 520695a..7ee4c7f 100644
--- a/mokosupport/src/main/java/com/moko/support/MokoSupport.java
+++ b/mokosupport/src/main/java/com/moko/support/MokoSupport.java
@@ -11,8 +11,6 @@
 import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 
 import com.moko.support.callback.MokoResponseCallback;
@@ -37,6 +35,8 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import no.nordicsemi.android.ble.BleManagerCallbacks;
 import no.nordicsemi.android.support.v18.scanner.BluetoothLeScannerCompat;
 import no.nordicsemi.android.support.v18.scanner.ScanFilter;
diff --git a/mokosupport/src/main/java/com/moko/support/OrderTaskAssembler.java b/mokosupport/src/main/java/com/moko/support/OrderTaskAssembler.java
index b46cecd..fb171be 100644
--- a/mokosupport/src/main/java/com/moko/support/OrderTaskAssembler.java
+++ b/mokosupport/src/main/java/com/moko/support/OrderTaskAssembler.java
@@ -18,8 +18,6 @@
 import com.moko.support.task.GetRunntime;
 import com.moko.support.task.GetSerialID;
 import com.moko.support.task.GetSoftVersion;
-import com.moko.support.task.SetSerialID;
-import com.moko.support.task.SetThreeAxes;
 import com.moko.support.task.GetTransmission;
 import com.moko.support.task.OrderTask;
 import com.moko.support.task.SetAdvInterval;
@@ -32,7 +30,9 @@
 import com.moko.support.task.SetMinor;
 import com.moko.support.task.SetOvertime;
 import com.moko.support.task.SetPassword;
+import com.moko.support.task.SetSerialID;
 import com.moko.support.task.SetSoftReboot;
+import com.moko.support.task.SetThreeAxes;
 import com.moko.support.task.SetTransmission;
 
 public class OrderTaskAssembler {
diff --git a/mokosupport/src/main/java/com/moko/support/task/GetAdvInterval.java b/mokosupport/src/main/java/com/moko/support/task/GetAdvInterval.java
index 6d4af7e..9e52f7a 100644
--- a/mokosupport/src/main/java/com/moko/support/task/GetAdvInterval.java
+++ b/mokosupport/src/main/java/com/moko/support/task/GetAdvInterval.java
@@ -1,7 +1,6 @@
 package com.moko.support.task;
 
 import com.moko.support.entity.OrderType;
-import com.moko.support.utils.MokoUtils;
 
 /**
  * @Date 2020/8/3
diff --git a/mokosupport/src/main/java/com/moko/support/task/GetDeviceUUID.java b/mokosupport/src/main/java/com/moko/support/task/GetDeviceUUID.java
index 025a875..ba273b8 100644
--- a/mokosupport/src/main/java/com/moko/support/task/GetDeviceUUID.java
+++ b/mokosupport/src/main/java/com/moko/support/task/GetDeviceUUID.java
@@ -2,7 +2,6 @@
 
 
 import com.moko.support.entity.OrderType;
-import com.moko.support.utils.MokoUtils;
 
 /**
  * @Date 2020/8/3
diff --git a/mokosupport/src/main/java/com/moko/support/task/GetMeasurePower.java b/mokosupport/src/main/java/com/moko/support/task/GetMeasurePower.java
index 09717cd..c1b884a 100644
--- a/mokosupport/src/main/java/com/moko/support/task/GetMeasurePower.java
+++ b/mokosupport/src/main/java/com/moko/support/task/GetMeasurePower.java
@@ -2,7 +2,6 @@
 
 
 import com.moko.support.entity.OrderType;
-import com.moko.support.utils.MokoUtils;
 
 /**
  * @Date 2020/8/3
diff --git a/mokosupport/src/main/java/com/moko/support/task/GetMinor.java b/mokosupport/src/main/java/com/moko/support/task/GetMinor.java
index 2fccbc9..3208d57 100644
--- a/mokosupport/src/main/java/com/moko/support/task/GetMinor.java
+++ b/mokosupport/src/main/java/com/moko/support/task/GetMinor.java
@@ -2,7 +2,6 @@
 
 
 import com.moko.support.entity.OrderType;
-import com.moko.support.utils.MokoUtils;
 
 /**
  * @Date 2020/8/3
diff --git a/mokosupport/src/main/java/com/moko/support/task/GetTransmission.java b/mokosupport/src/main/java/com/moko/support/task/GetTransmission.java
index 67feaeb..2111ff3 100644
--- a/mokosupport/src/main/java/com/moko/support/task/GetTransmission.java
+++ b/mokosupport/src/main/java/com/moko/support/task/GetTransmission.java
@@ -2,7 +2,6 @@
 
 
 import com.moko.support.entity.OrderType;
-import com.moko.support.utils.MokoUtils;
 
 /**
  * @Date 2020/8/3