1 迁移到androidx

YangShuai
1 parent f0c79d5e
Showing 91 changed files with 155 additions and 291 deletions
app/build.gradle
app/src/androidTest/java/com/example/modulepedometer/ExampleInstrumentedTest.java
app/src/main/java/com/example/modulepedometer/MainActivity.java
build.gradle
config.gradle
gradle.properties
moudle_pedometer/build.gradle
moudle_pedometer/src/androidTest/java/com/example/moudle_pedometer/ExampleInstrumentedTest.java
moudle_pedometer/src/main/java/com/cnlive/moudle/calorie/service/CalorieService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningFinishFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollTraceListDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceListView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceNameListView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollKeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/service/CollStepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollPedometerMainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunningFinishActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/RaceListActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/RaceNameListActivity.java
@@ -13,7 +13,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         multiDexEnabled true
         javaCompileOptions {
             annotationProcessorOptions {
@@ -74,11 +74,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     implementation project(':moudle_pedometer')
     implementation "com.cnlive.libs:base:$rootProject.libBase"
     implementation "com.qmuiteam:qmui:$rootProject.qmui"
@@ -87,7 +87,7 @@ dependencies {
     //ARouter
     implementation "com.alibaba:arouter-api:$rootProject.arouterApiVersion"
     annotationProcessor "com.alibaba:arouter-compiler:$rootProject.arouterCompilerVersion"
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation project(':library_baidumap')
 package com.example.modulepedometer;
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -2,31 +2,16 @@ package com.example.modulepedometer;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.text.TextUtils;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
+
 import android.view.View;
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.baidu.mapapi.model.LatLng;
-import com.baidu.mapapi.search.geocode.GeoCodeResult;
-import com.baidu.mapapi.search.geocode.GeoCoder;
-import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener;
-import com.baidu.mapapi.search.geocode.ReverseGeoCodeOption;
-import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult;
-import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.calorie.service.CalorieService;
-import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
-import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;
-import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
-import com.cnlive.moudle.pedometer.model.Constant;
-import com.cnlive.moudle.pedometer.service.KeepLiveService;
-import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
-import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
-import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 public class MainActivity extends AppCompatActivity {
@@ -56,28 +56,24 @@ ext {
     minSdkVersion = 16
     targetSdkVersion = 29
-    //support 相关
-    supportV4 = '28.0.0'
-    appcompatV7 = '28.0.0'
-    design = '28.0.0'
-    supportV13 = '28.0.0'
-    recyclerviewV7 = '28.0.0'
-    cardviewV7 = '28.0.0'
-
-    appArch = '1.1.0'
+    appArch = '1.3.6.2-androidx-beta1'
     //qmui
     qmui = '1.1.5'
-    libBase = '1.9.1.4'
+    libBase = '1.9.1.8-androidx-beta3'
     libNetwork = '1.1.0'
     libLargeImage = '1.0.1'
     libEmoj = '1.9.8'
     libMenu = '1.0.4'
     //glide
-    glide = '4.5.0'
-    glideTransformations = '3.0.1'
-    compiler = '4.5.0'
+//    glide = '4.5.0'
+//    glideTransformations = '3.0.1'
+//    compiler = '4.5.0'
+
+    glide = '4.11.0'
+    glideTransformations = '4.1.0'
+    compiler = '4.11.0'
     magicindicator = '1.6.0'
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.1.9",
+            version: "1.1.9-androidx-beta1",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -14,4 +14,6 @@ org.gradle.jvmargs=-Xmx1536m
 #android.useAndroidX=true
 #android.enableJetifier=true
 android.injected.testOnly=false
+android.useAndroidX=true
+android.enableJetifier=true
@@ -57,12 +57,12 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "com.android.support:support-v4:$rootProject.supportV4"
-    implementation "com.android.support:appcompat-v7:$rootProject.appcompatV7"
-    implementation "com.android.support:design:$rootProject.design"
-    implementation "com.android.support:support-v13:$rootProject.supportV13"
-    implementation "com.android.support:recyclerview-v7:$rootProject.recyclerviewV7"
-    implementation "com.android.support:cardview-v7:$rootProject.cardviewV7"
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     implementation "com.cnlive.libs:arch:$rootProject.appArch"
     implementation "com.qmuiteam:qmui:$rootProject.qmui"
     implementation "com.cnlive.libs:base:$rootProject.libBase"
@@ -73,8 +73,8 @@ dependencies {
     //glide
     implementation "com.github.bumptech.glide:glide:$rootProject.glide"
     implementation "jp.wasabeef:glide-transformations:$rootProject.glideTransformations"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     annotationProcessor "com.github.bumptech.glide:compiler:$rootProject.compiler"
     //--------------------------------------------------------
 package com.example.moudle_pedometer;
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,7 +19,7 @@ import android.os.Binder;
 import android.os.Build;
 import android.os.CountDownTimer;
 import android.os.IBinder;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.RemoteViews;
@@ -3,7 +3,7 @@ package com.cnlive.moudle.collectionTrace.frame.view;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.Handler;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MotionEvent;
@@ -3,7 +3,7 @@ package com.cnlive.moudle.collectionTrace.frame.view;
 import android.content.Context;
 import android.graphics.Point;
 import android.os.Handler;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MotionEvent;
 package com.cnlive.moudle.collectionTrace.frame.view;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
 package com.cnlive.moudle.collectionTrace.frame.view;
 import android.os.Handler;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -13,23 +13,18 @@ import com.baidu.trace.api.fence.CreateFenceResponse;
 import com.baidu.trace.api.fence.DeleteFenceRequest;
 import com.baidu.trace.api.fence.DeleteFenceResponse;
 import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
-import com.baidu.trace.api.fence.FenceInfo;
 import com.baidu.trace.api.fence.FenceListRequest;
 import com.baidu.trace.api.fence.FenceListResponse;
-import com.baidu.trace.api.fence.FenceShape;
 import com.baidu.trace.api.fence.HistoryAlarmResponse;
 import com.baidu.trace.api.fence.ListMonitoredPersonResponse;
 import com.baidu.trace.api.fence.MonitoredStatusByLocationResponse;
 import com.baidu.trace.api.fence.MonitoredStatusResponse;
 import com.baidu.trace.api.fence.OnFenceListener;
-import com.baidu.trace.api.fence.PolylineFence;
 import com.baidu.trace.api.fence.UpdateFenceResponse;
 import com.baidu.trace.model.CoordType;
 import com.baidu.trace.model.LatLng;
 import com.cnlive.libs.base.util.AlertUtil;
-import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.frame.presenter.RaceNameListPresenter;
-import com.cnlive.moudle.collectionTrace.model.BindingShoeInfo;
 import com.cnlive.moudle.collectionTrace.model.CollectPoint;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollTraceListDetailActivity;
@@ -46,7 +41,6 @@ import com.cnlive.moudle.pedometer.utils.NetUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Context;
@@ -15,13 +14,11 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.util.Log;
 import com.cnlive.moudle.collectionTrace.receivers.CollServiceReceiver;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
-import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity;
-import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
 import com.example.moudle_pedometer.R;
@@ -20,11 +20,10 @@ import android.os.Build;
 import android.os.CountDownTimer;
 import android.os.Handler;
 import android.os.IBinder;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.RemoteViews;
-import android.widget.Toast;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.Trace;
@@ -36,14 +35,12 @@ import com.baidu.trace.model.OnTraceListener;
 import com.baidu.trace.model.PushMessage;
 import com.baidu.trace.model.StatusCodes;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
-import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.model.step.StepCount;
 import com.cnlive.moudle.pedometer.model.step.StepValuePassListener;
 import com.cnlive.moudle.pedometer.sql.db.DbCore;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
-import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
 import com.example.moudle_pedometer.R;
@@ -3,14 +3,12 @@ package com.cnlive.moudle.collectionTrace.ui.activity;
 import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v4.app.NotificationManagerCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.widget.Toast;
@@ -19,7 +17,6 @@ import com.cnlive.libs.base.ui.QMUIFragmentActivity;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunMainFragment;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
-import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsListener;
 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsUtils;
@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -14,10 +14,6 @@ import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunMainFragment;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunRaceDetailFragment;
-import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
-import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
-import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
-import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.CheckUtil;
 import com.example.moudle_pedometer.R;
@@ -3,15 +3,13 @@ package com.cnlive.moudle.collectionTrace.ui.activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunningFinishFragment;
-import com.cnlive.moudle.pedometer.model.RunningFinishBean;
-import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
 import com.example.moudle_pedometer.R;
 /**
@@ -2,7 +2,7 @@ package com.cnlive.moudle.collectionTrace.ui.activity;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import com.cnlive.libs.base.util.StatusBarUtil;
@@ -2,7 +2,7 @@ package com.cnlive.moudle.collectionTrace.ui.activity;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import com.cnlive.libs.base.util.StatusBarUtil;
@@ -9,9 +9,9 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+
 import android.widget.Toast;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -21,7 +21,6 @@ import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.ui.fragment.StartTraceFragment;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
-import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.utils.CheckUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 package com.cnlive.moudle.collectionTrace.ui.adapter;
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 package com.cnlive.moudle.collectionTrace.ui.adapter;
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 package com.cnlive.moudle.collectionTrace.ui.adapter;
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 package com.cnlive.moudle.collectionTrace.ui.fragment;
 import android.os.Bundle;
-import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,18 +13,11 @@ import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunMainFragmentPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.CollRunMainFragmentView;
-import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
-import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
-import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
-import com.cnlive.moudle.pedometer.utils.GsonUtil;
-import com.cnlive.moudle.pedometer.utils.StepUtil;
-import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentCollRunMainBinding;
-import com.example.moudle_pedometer.databinding.FragmentRunMainBinding;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 package com.cnlive.moudle.collectionTrace.ui.fragment;
-import android.content.Intent;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.util.Log;
+import androidx.annotation.Nullable;
+
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Button;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -15,12 +13,9 @@ import com.cnlive.moudle.collectionTrace.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunRaceDetailFragmentPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.CollRunRaceDetailFragmentView;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
-import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
-import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
-import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentCollectRunRaceDetailBinding;
 package com.cnlive.moudle.collectionTrace.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -9,12 +9,9 @@ import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunningFinishFragme
 import com.cnlive.moudle.collectionTrace.frame.view.CollRunningFinishFragmentView;
 import com.cnlive.moudle.collectionTrace.utils.CollStepUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
-import com.cnlive.moudle.pedometer.frame.presenter.RunningFinishFragmetPresenter;
-import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentCollFinishRunMapBinding;
-import com.example.moudle_pedometer.databinding.FragmentFinishRunMapBinding;
 public class CollRunningFinishFragment extends QMUIFragment<CollRunningFinishFragmentView, CollRunningFinishFragmetPresenter, FragmentCollFinishRunMapBinding> {
 //    private RunningFinishBean runningFinishBean;
@@ -5,7 +5,7 @@ import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Bundle;
 import android.os.Vibrator;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
 package com.cnlive.moudle.collectionTrace.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -10,7 +10,6 @@ import com.cnlive.moudle.collectionTrace.frame.presenter.CollTraceListDetailFrag
 import com.cnlive.moudle.collectionTrace.frame.view.CollTraceListDetailFragmentView;
 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
 import com.example.moudle_pedometer.R;
-import com.example.moudle_pedometer.databinding.FragmentCollFinishRunMapBinding;
 import com.example.moudle_pedometer.databinding.FragmentCollRaceDetailBinding;
 /**
@@ -2,7 +2,7 @@ package com.cnlive.moudle.collectionTrace.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
@@ -2,7 +2,7 @@ package com.cnlive.moudle.collectionTrace.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
@@ -3,7 +3,7 @@ package com.cnlive.moudle.collectionTrace.ui.fragment;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -11,9 +11,7 @@ import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.frame.presenter.StartTraceFragmentPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.StartTraceFragmentView;
-import com.cnlive.moudle.collectionTrace.ui.activity.CollPedometerMainActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity;
-import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 package com.cnlive.moudle.pedometer.frame.view;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 package com.cnlive.moudle.pedometer.frame.view;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
@@ -13,7 +13,6 @@ import com.cnlive.moudle.pedometer.ui.adapter.MyRecordAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.MyRecordFragment;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
 package com.cnlive.moudle.pedometer.frame.view;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.view.View;
 package com.cnlive.moudle.pedometer.frame.view;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
@@ -13,7 +13,6 @@ import com.cnlive.moudle.pedometer.ui.adapter.RunLineAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.RunLineFragment;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
@@ -4,14 +4,13 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Point;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 package com.cnlive.moudle.pedometer.frame.view;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
-import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
@@ -20,15 +19,12 @@ import com.cnlive.moudle.pedometer.ui.fragment.SelfRecordFragment;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
-import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter;
 import com.scwang.smartrefresh.layout.header.ClassicsHeader;
 import java.util.ArrayList;
 import java.util.List;
-import q.rorbin.badgeview.QBadgeView;
-
 /**
  * Created by hanyayun 019/06/12.
  */
 package com.cnlive.moudle.pedometer.frame.view;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
 package com.cnlive.moudle.pedometer.service;
-import android.app.job.JobInfo;
 import android.app.job.JobParameters;
-import android.app.job.JobScheduler;
 import android.app.job.JobService;
-import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Context;
@@ -15,12 +14,11 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.util.Log;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.receivers.ServiceReceiver;
-import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
 import com.example.moudle_pedometer.R;
@@ -20,19 +20,15 @@ import android.os.Build;
 import android.os.CountDownTimer;
 import android.os.Handler;
 import android.os.IBinder;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.RemoteViews;
-import android.widget.Toast;
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
 import com.baidu.location.LocationClient;
 import com.baidu.location.LocationClientOption;
-import com.baidu.mapapi.map.MapStatus;
-import com.baidu.mapapi.map.MapStatusUpdateFactory;
-import com.baidu.mapapi.map.MyLocationData;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.LBSTraceClient;
@@ -61,18 +57,15 @@ import com.baidu.trace.model.OnTraceListener;
 import com.baidu.trace.model.PushMessage;
 import com.baidu.trace.model.StatusCodes;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
-import com.cnlive.moudle.pedometer.frame.view.RunMainFragmentView;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.model.step.StepCount;
 import com.cnlive.moudle.pedometer.model.step.StepValuePassListener;
 import com.cnlive.moudle.pedometer.sql.db.DbCore;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
-import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
-import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import org.greenrobot.eventbus.EventBus;
@@ -2,13 +2,12 @@ package com.cnlive.moudle.pedometer.ui.activity;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.ui.fragment.LineUpAgainFragment;
-import com.cnlive.moudle.pedometer.ui.fragment.RaceRecorFragment;
 import com.example.moudle_pedometer.R;
 /**
@@ -2,12 +2,12 @@ package com.cnlive.moudle.pedometer.ui.activity;
 import android.app.Activity;
 import android.content.Intent;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import com.alibaba.android.arouter.facade.annotation.Route;
 package com.cnlive.moudle.pedometer.ui.activity;
-import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Build;
-import android.provider.Settings;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.NotificationManagerCompat;
-import android.text.TextUtils;
-import android.util.Log;
-import android.widget.Toast;
+
+import androidx.core.app.NotificationManagerCompat;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.baidu.mapapi.model.LatLng;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
-import com.cnlive.moudle.pedometer.utils.MyMapUtil;
-import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsListener;
-import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsUtils;
 import com.example.moudle_pedometer.R;
 import java.io.Serializable;
 import java.util.List;
-import static android.app.Notification.EXTRA_CHANNEL_ID;
-import static android.provider.Settings.EXTRA_APP_PACKAGE;
-
 /**
  * 计步器主activity
  */
@@ -2,7 +2,7 @@ package com.cnlive.moudle.pedometer.ui.activity;
 import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import com.cnlive.libs.base.util.StatusBarUtil;
@@ -2,7 +2,7 @@ package com.cnlive.moudle.pedometer.ui.activity;
 import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import com.cnlive.libs.base.util.StatusBarUtil;
@@ -2,7 +2,7 @@ package com.cnlive.moudle.pedometer.ui.activity;
 import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -3,13 +3,12 @@ package com.cnlive.moudle.pedometer.ui.activity;
 import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -3,15 +3,13 @@ package com.cnlive.moudle.pedometer.ui.activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
-import com.cnlive.moudle.pedometer.model.RunningMapBean;
-import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
 import com.example.moudle_pedometer.R;
@@ -2,7 +2,7 @@ package com.cnlive.moudle.pedometer.ui.activity;
 import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import com.cnlive.libs.base.util.StatusBarUtil;
@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -2,7 +2,7 @@ package com.cnlive.moudle.pedometer.ui.activity;
 import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import com.cnlive.libs.base.util.StatusBarUtil;
@@ -2,9 +2,9 @@ package com.cnlive.moudle.pedometer.ui.adapter;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,9 +12,7 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import com.cnlive.moudle.pedometer.net.bean.EventRouteRecordBeanVoListBean;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
-import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 package com.cnlive.moudle.pedometer.ui.adapter;
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -2,8 +2,8 @@ package com.cnlive.moudle.pedometer.ui.adapter;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,9 +13,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.bitmap.CircleCrop;
-import com.bumptech.glide.request.RequestOptions;
 import com.cnlive.moudle.pedometer.net.bean.EventRouteRecordBeanVoListBean;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 package com.cnlive.moudle.pedometer.ui.adapter;
 import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 package com.cnlive.moudle.pedometer.ui.adapter;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -2,27 +2,20 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.LineUpAgainPresenter;
 import com.cnlive.moudle.pedometer.frame.view.LineUpAgainView;
-import com.cnlive.moudle.pedometer.model.Constant;
-import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
-import com.cnlive.moudle.pedometer.utils.ChineseToSpeechUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentLineUpAgainBinding;
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
 import java.util.List;
 /**
@@ -2,8 +2,8 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
@@ -2,7 +2,7 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
@@ -2,15 +2,12 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
-import android.widget.Toast;
 import com.baidu.trace.LBSTraceClient;
-import com.baidu.trace.Trace;
 import com.baidu.trace.api.fence.AddMonitoredPersonRequest;
 import com.baidu.trace.api.fence.AddMonitoredPersonResponse;
 import com.baidu.trace.api.fence.CreateFenceResponse;
@@ -24,8 +21,6 @@ import com.baidu.trace.api.fence.MonitoredStatusResponse;
 import com.baidu.trace.api.fence.OnFenceListener;
 import com.baidu.trace.api.fence.UpdateFenceResponse;
 import com.baidu.trace.model.LocationMode;
-import com.baidu.trace.model.OnTraceListener;
-import com.baidu.trace.model.PushMessage;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
@@ -2,9 +2,9 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
@@ -3,14 +3,12 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Vibrator;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import com.baidu.mapapi.model.LatLng;
 import com.cnlive.libs.base.ui.QMUIFragment;
-import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.collectionTrace.model.CollectPoint;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
@@ -3,11 +3,10 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.util.StatusBarUtil2;
@@ -22,7 +21,6 @@ import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRunRaceDetailBinding;
 import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
-import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
-import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.util.Log;
+
+import androidx.annotation.Nullable;
+
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -12,7 +12,6 @@ import com.cnlive.moudle.pedometer.frame.presenter.RunningFinishFragmetPresenter
 import com.cnlive.moudle.pedometer.frame.view.RunningFinishFragmentView;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
-import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentFinishRunMapBinding;
 package com.cnlive.moudle.pedometer.ui.fragment;
 import android.app.Service;
-import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.SystemClock;
 import android.os.Vibrator;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.util.Log;
+import androidx.annotation.Nullable;
+
 import android.view.View;
-import com.baidu.mapapi.model.LatLng;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
@@ -22,15 +17,10 @@ import com.cnlive.moudle.pedometer.frame.view.RunningMapFragmentView;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
-import com.cnlive.moudle.pedometer.service.StepService;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
 import com.cnlive.moudle.pedometer.utils.ChineseToSpeechUtil;
-import com.cnlive.moudle.pedometer.utils.GsonUtil;
-import com.cnlive.moudle.pedometer.utils.MyMapUtil;
-import com.cnlive.moudle.pedometer.utils.MySpHelper;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
-import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRunningMapBinding;
@@ -38,9 +28,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import java.util.ArrayList;
-import java.util.List;
-
 import static android.content.Context.SENSOR_SERVICE;
 /**
 package com.cnlive.moudle.pedometer.ui.fragment;
-import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
@@ -2,7 +2,7 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
 package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -3,7 +3,7 @@ package com.cnlive.moudle.pedometer.ui.widget;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -3,7 +3,7 @@ package com.cnlive.moudle.pedometer.ui.widget;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -4,7 +4,7 @@ package com.cnlive.moudle.pedometer.upload.utils;
  * Created by xiansong on 2018/3/28.
  */
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.io.File;
 import java.io.FileInputStream;
@@ -4,7 +4,7 @@ package com.cnlive.moudle.pedometer.utils;
  * Created by xiansong on 2018/3/28.
  */
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import java.io.File;
 import java.io.FileInputStream;
@@ -4,11 +4,9 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
 import android.widget.Toast;
-import com.cnlive.libs.base.util.AlertUtil;
-
 import static android.app.Notification.EXTRA_CHANNEL_ID;
 import static android.provider.Settings.EXTRA_APP_PACKAGE;
@@ -3,7 +3,7 @@ package com.cnlive.moudle.pedometer.utils;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 public class PermissionResultUtil {
@@ -4,13 +4,10 @@ import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
-import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
-import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.FailedEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.db.DbCore;
-import com.cnlive.moudle.pedometer.sql.entity.CollFailedEntity;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
@@ -20,7 +17,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-import static android.support.constraint.Constraints.TAG;
 /**
  * 步数工具
@@ -8,9 +8,9 @@ import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ForegroundColorSpan;
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="48dp" />
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabs"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
         app:tabSelectedTextColor="#23D41E"
         app:tabTextColor="#999999" />
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
@@ -21,7 +21,7 @@
                 android:layout_height="match_parent"
                 android:background="#F8F8F8">
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
@@ -11,7 +11,7 @@
             android:layout_height="match_parent"
             android:background="#F4F4F4">
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/my_record_recy"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
@@ -16,7 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/race_recy"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -49,7 +49,7 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent">
-           <android.support.v7.widget.RecyclerView
+           <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/race_recy"
                android:layout_width="match_parent"
                android:layout_height="match_parent"/>
@@ -158,7 +158,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/record_recy"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -58,7 +58,7 @@
             android:layout_height="match_parent"
             android:background="#F4F4F4">
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/run_line_recy"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -290,7 +290,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/record_recy"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/take_part_recy"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
@@ -97,12 +97,12 @@
                 android:layout_marginTop="-3dp"
                 android:gravity="center_vertical">
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_list"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingTop="10dp"
-                    android:paddingBottom="10dp"></android.support.v7.widget.RecyclerView>
+                    android:paddingBottom="10dp"></androidx.recyclerview.widget.RecyclerView>
             </LinearLayout>
             <!---->
         </LinearLayout>
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -10,4 +10,4 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:ignore="MissingConstraints" />
-</android.support.constraint.ConstraintLayout>
 \ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
 \ No newline at end of file