从lib 去掉地图包，地图和定位随后会单独建包

ApexDrivers/RAUtilsLibrary/build.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 29
     defaultConfig {
 //        applicationId "com.usai.redant.rautils"
         minSdkVersion 21
-        targetSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -20,20 +20,24 @@ android {
     }
     libraryVariants.all { variant ->
 //        if (variant.buildType.name == 'release') {
-        variant.assemble.doLast {
-            variant.outputs.each { output ->
-                def outputFile = output.outputFile
+        variant.getAssembleProvider().configure()  {
+            it.doLast {
+                variant.outputs.each { output ->
+                    def outputFile = output.outputFile
 //                    if (outputFile != null && outputFile.name.endsWith('release.aar')) {
-                def fileName = "${project.name}"
-                println(fileName)
-                def outputPath = "../output"
-                copy {
-                    from outputFile
-                    into outputPath
-                    rename { fileName + ".aar" }
-                }
+                    def fileName = "${project.name}"
+                    println(fileName)
+                    def outputPath = "../output"
+                    copy {
+                        from outputFile
+                        into outputPath
+                        rename { fileName + ".aar" }
+                    }
 //                    }
+                }
             }
+
+
         }
 //        }
     }
@@ -47,15 +51,15 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    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'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+//    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'
     api files('libs/bcprov-jdk15on-157.jar')
     api files('libs/httpmime-4.1.1.jar')
-    api 'com.google.android.gms:play-services-location:16.0.0'
+//    api 'com.google.android.gms:play-services-location:17.0.0'
     api files('libs/core-2.3.0.jar')
-    api 'com.github.barteksc:android-pdf-viewer:3.0.0-beta.5'
+    api 'com.github.barteksc:android-pdf-viewer:3.2.0-beta.1'
 }
 
 

ApexDrivers/RAUtilsLibrary/src/androidTest/java/com/usai/redant/rautils/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.usai.redant.rautils;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.usai.redant.rautils", appContext.getPackageName());
-    }
-}

ApexDrivers/RAUtilsLibrary/src/main/AndroidManifest.xml

@@ -3,6 +3,8 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="com.usai.redant.rautils">
 
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/actionsheet/ActionSheet.java

@@ -3,8 +3,8 @@ package com.usai.redant.rautils.actionsheet;
 import android.app.Dialog;
 import android.content.Context;
 import android.graphics.Color;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextPaint;
 import android.util.TypedValue;
 import android.view.Gravity;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/application/ApexApplication.java

@@ -17,7 +17,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.provider.Settings;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.text.TextUtils;
 
 import com.usai.redant.rautils.receiver.RABroadcast;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/base/BaseDialog.java

@@ -2,7 +2,7 @@ package com.usai.redant.rautils.base;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/button/RAButton.java

@@ -6,7 +6,7 @@ import android.util.AttributeSet;
 
 import java.util.HashMap;
 
-public class RAButton extends android.support.v7.widget.AppCompatButton {
+public class RAButton extends androidx.appcompat.widget.AppCompatButton {
 
     private HashMap<RAButtonState,Drawable> stateDrawableHashMap = new HashMap<>();
     private HashMap<RAButtonState,String> stateTitleHashMap = new HashMap<>();

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/calendar_event/CalendarEventManager.java

@@ -11,7 +11,7 @@ import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.CalendarContract;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
 
 import java.util.ArrayList;
 import java.util.TimeZone;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/camera/CameraHelper.java

@@ -9,7 +9,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
-import android.support.v4.content.PermissionChecker;
+import androidx.core.content.PermissionChecker;
 import android.text.format.DateFormat;
 import android.widget.Toast;
 

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/carousel/CarouselView.java

@@ -2,9 +2,9 @@ package com.usai.redant.rautils.carousel;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/datetimepicker/DatePickerView.java

@@ -2,7 +2,7 @@ package com.usai.redant.rautils.datetimepicker;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/datetimepicker/DateTimePickerDialog.java

@@ -1,8 +1,8 @@
 package com.usai.redant.rautils.datetimepicker;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/datetimepicker/TimePickerView.java

@@ -1,7 +1,7 @@
 package com.usai.redant.rautils.datetimepicker;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.LinearLayout;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/fileviewer/FileViewerActivity.java

@@ -3,8 +3,8 @@ package com.usai.redant.rautils.fileviewer;
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.MenuItem;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/infinitephoto/InfinitePhotoActivity.java

@@ -4,8 +4,8 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/location/SystemLocation.java

@@ -10,8 +10,8 @@ import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AlertDialog;
+import androidx.core.app.ActivityCompat;
+import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 
 public class SystemLocation {

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/preview/RAPDFPreviewActivity.java

@@ -10,9 +10,9 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.content.FileProvider;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.content.FileProvider;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/receiver/BootCompleteBroadcastReceiver.java

@@ -13,8 +13,9 @@ public abstract class BootCompleteBroadcastReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
 
-        dbgUtil.fileLog(context,"RAUtilsLibrary: onReceive" + intent.getAction());
-
+//        dbgUtil.fileLog(context,"RAUtilsLibrary: onReceive" + intent.getAction());
+        dbgUtil.Logd("RAUtilsLibrary","RAUtilsLibrary:: BootCompleteBroadcastReceiver:onReceive" + intent.getAction()+"packeg: "+context.getPackageName());
+        dbgUtil.fileLog(context,"RAUtilsLibrary:: BootCompleteBroadcastReceiver:onReceive" + intent.getAction()+"packeg: "+context.getPackageName());
 //        dbgUtil.fileLog(context,"RAUtilsLibrary: BootCompleteBroadcastReceiver onReceive");
 
         if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/roundcornerimageview/RoundCornerImageView.java

@@ -10,10 +10,10 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 
-public class RoundCornerImageView extends android.support.v7.widget.AppCompatImageView {
+public class RoundCornerImageView extends androidx.appcompat.widget.AppCompatImageView {
 
     private int roundCorner;
 

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/service/RAService.java

@@ -17,19 +17,19 @@ import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.google.android.gms.location.FusedLocationProviderClient;
-import com.google.android.gms.location.LocationCallback;
-import com.google.android.gms.location.LocationRequest;
-import com.google.android.gms.location.LocationResult;
-import com.google.android.gms.location.LocationServices;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
+//import com.google.android.gms.location.FusedLocationProviderClient;
+//import com.google.android.gms.location.LocationCallback;
+//import com.google.android.gms.location.LocationRequest;
+//import com.google.android.gms.location.LocationResult;
+//import com.google.android.gms.location.LocationServices;
+//import com.google.android.gms.tasks.OnCompleteListener;
+//import com.google.android.gms.tasks.Task;
 import com.usai.redant.rautils.R;
 import com.usai.redant.rautils.location.SystemLocation;
 import com.usai.redant.rautils.receiver.RABroadcast;
@@ -109,33 +109,36 @@ public abstract class RAService extends Service {
 //    LocationListener locationListener = null;
 //    LocationManager locationManager = null;
 
-    private LocationRequest mLocationRequest;
-
-    /**
-     * Provides access to the Fused Location Provider API.
-     */
-    private FusedLocationProviderClient mFusedLocationClient;
-
-    /**
-     * Callback for changes in location.
-     */
-    private LocationCallback mLocationCallback;
-
-//    private Handler mServiceHandler;
-
-    /**
-     * The current location.
-     */
-    private Location mLocation;
-
-//    int locationTracing_timeInterval = DEFAULT_LOCATION_TIMEINTERVAL;
-//    int locationTracing_distance = DEFAULT_DISTANCE;
-    //    protected abstract void onLocationChanged(Location location);
-    private ServiceLocation locationCallback = null;
+    //============= 定位会移动到单独的lib中===========
 
+//
+//    private LocationRequest mLocationRequest;
+//
+//    /**
+//     * Provides access to the Fused Location Provider API.
+//     */
+//    private FusedLocationProviderClient mFusedLocationClient;
+//
+//    /**
+//     * Callback for changes in location.
+//     */
+//    private LocationCallback mLocationCallback;
+//
+////    private Handler mServiceHandler;
+//
+//    /**
+//     * The current location.
+//     */
+//    private Location mLocation;
+//
+////    int locationTracing_timeInterval = DEFAULT_LOCATION_TIMEINTERVAL;
+////    int locationTracing_distance = DEFAULT_DISTANCE;
+//    //    protected abstract void onLocationChanged(Location location);
+//    private ServiceLocation locationCallback = null;
+//
     public interface ServiceLocation {
 
-
+//此类将去掉
         public abstract Location RequestCachedLocation();
 //        public abstract void RequestLocation_ByBroadcast(String receiverID);
 
@@ -143,106 +146,111 @@ public abstract class RAService extends Service {
 //        public abstract void onLogin();
 //		public abstract void onLogout();
     }
-
+//
     public void initServiceLocation(boolean systemLocation, ServiceLocation locationCallback) {
-        System_Location_Flag = systemLocation;
-
-        service_flag = service_flag | FLAG_SERVICE_LOCATION;
-        this.locationCallback = locationCallback;
-    }
-    /**
-     * Sets the location request parameters.
-     */
-    private void createLocationRequest() {
-
-        if (System_Location_Flag) {
-
-        } else {
-
-            mLocationRequest = new LocationRequest();
-            mLocationRequest.setInterval(DEFAULT_LOCATION_TIMEINTERVAL);
-            mLocationRequest.setFastestInterval(DEFAULT_LOCATION_TIMEINTERVAL/2);
-            mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
-        }
-
-    }
-
-    private void requestLocationUpdates() {
-        Log.i(TAG, "Requesting location updates");
-
-        if (System_Location_Flag) {
-
-        } else {
-
-            //        Utils.setRequestingLocationUpdates(this, true);
-//        startService(new Intent(getApplicationContext(), LocationUpdatesService.class));
-            try {
-
-                Log.d(TAG, "requestLocationUpdates: ");
-//                long dbg_l = mLocationRequest.getNumUpdates();
-//                if(backgroundLocationTracing)
-//                    mLocationRequest.setNumUpdates(0);
-//                else
-//                    mLocationRequest.setNumUpdates(1);
-                mFusedLocationClient.requestLocationUpdates(mLocationRequest,
-                        mLocationCallback, null);
-            } catch (SecurityException unlikely) {
-//            Utils.setRequestingLocationUpdates(this, false);
-                Log.e(TAG, "Lost location permission. Could not request updates. " + unlikely);
-            }
-        }
-    }
-
-    /**
-     * Removes location updates. Note that in this sample we merely log the
-     * {@link SecurityException}.
-     */
-    private void removeLocationUpdates() {
-        Log.i(TAG, "Removing location updates");
-
-        if (System_Location_Flag) {
-
-            SystemLocation.sharedLocation().stopRequestLocation();
-
-        } else {
-
-            try {
-                mFusedLocationClient.removeLocationUpdates(mLocationCallback);
-//            Utils.setRequestingLocationUpdates(this, false);
-                stopSelf();
-            } catch (SecurityException unlikely) {
-//            Utils.setRequestingLocationUpdates(this, true);
-                Log.e(TAG, "Lost location permission. Could not remove updates. " + unlikely);
-            }
-
-        }
 
+        return ;//此接口将去掉
+//        System_Location_Flag = systemLocation;
+//
+//        service_flag = service_flag | FLAG_SERVICE_LOCATION;
+//        this.locationCallback = locationCallback;
     }
-    private void getLastLocation() {
-
-        if (System_Location_Flag) {
-
-        } else {
-
-            try {
-                mFusedLocationClient.getLastLocation()
-                        .addOnCompleteListener(new OnCompleteListener<Location>() {
-                            @Override
-                            public void onComplete(@NonNull Task<Location> task) {
-                                if (task.isSuccessful() && task.getResult() != null) {
-                                    mLocation = task.getResult();
-                                } else {
-                                    Log.w(TAG, "Failed to get location.");
-                                }
-                            }
-                        });
-            } catch (SecurityException unlikely) {
-                Log.e(TAG, "Lost location permission." + unlikely);
-            }
-
-        }
+//    /**
+//     * Sets the location request parameters.
+//     */
+//    private void createLocationRequest() {
+//
+//        if (System_Location_Flag) {
+//
+//        } else {
+//
+//            mLocationRequest = new LocationRequest();
+//            mLocationRequest.setInterval(DEFAULT_LOCATION_TIMEINTERVAL);
+//            mLocationRequest.setFastestInterval(DEFAULT_LOCATION_TIMEINTERVAL/2);
+//            mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
+//        }
+//
+//    }
+//
+//    private void requestLocationUpdates() {
+//        Log.i(TAG, "Requesting location updates");
+//
+//        if (System_Location_Flag) {
+//
+//        } else {
+//
+//            //        Utils.setRequestingLocationUpdates(this, true);
+////        startService(new Intent(getApplicationContext(), LocationUpdatesService.class));
+//            try {
+//
+//                Log.d(TAG, "requestLocationUpdates: ");
+////                long dbg_l = mLocationRequest.getNumUpdates();
+////                if(backgroundLocationTracing)
+////                    mLocationRequest.setNumUpdates(0);
+////                else
+////                    mLocationRequest.setNumUpdates(1);
+//                mFusedLocationClient.requestLocationUpdates(mLocationRequest,
+//                        mLocationCallback, null);
+//            } catch (SecurityException unlikely) {
+////            Utils.setRequestingLocationUpdates(this, false);
+//                Log.e(TAG, "Lost location permission. Could not request updates. " + unlikely);
+//            }
+//        }
+//    }
+//
+//    /**
+//     * Removes location updates. Note that in this sample we merely log the
+//     * {@link SecurityException}.
+//     */
+//    private void removeLocationUpdates() {
+//        Log.i(TAG, "Removing location updates");
+//
+//        if (System_Location_Flag) {
+//
+//            SystemLocation.sharedLocation().stopRequestLocation();
+//
+//        } else {
+//
+//            try {
+//                mFusedLocationClient.removeLocationUpdates(mLocationCallback);
+////            Utils.setRequestingLocationUpdates(this, false);
+//                stopSelf();
+//            } catch (SecurityException unlikely) {
+////            Utils.setRequestingLocationUpdates(this, true);
+//                Log.e(TAG, "Lost location permission. Could not remove updates. " + unlikely);
+//            }
+//
+//        }
+//
+//    }
+//    private void getLastLocation() {
+//
+//        if (System_Location_Flag) {
+//
+//        } else {
+//
+//            try {
+//                mFusedLocationClient.getLastLocation()
+//                        .addOnCompleteListener(new OnCompleteListener<Location>() {
+//                            @Override
+//                            public void onComplete(@NonNull Task<Location> task) {
+//                                if (task.isSuccessful() && task.getResult() != null) {
+//                                    mLocation = task.getResult();
+//                                } else {
+//                                    Log.w(TAG, "Failed to get location.");
+//                                }
+//                            }
+//                        });
+//            } catch (SecurityException unlikely) {
+//                Log.e(TAG, "Lost location permission." + unlikely);
+//            }
+//
+//        }
+//
+//    }
+//
+//
 
-    }
     // sub function Notification
     protected String url_checknotification = null;
     int pushcheck_timeInterval = DEFAULT_PUSHNOTIFICATION_TIMEINTERVAL;
@@ -468,12 +476,12 @@ public abstract class RAService extends Service {
             // for ActivityCompat#requestPermissions for more details.
 //                return;
         }
-        else
-        {
-
-            initLocation();
-
-        }
+//        else
+//        {
+//
+//            initLocation();
+//
+//        }
         return super.onStartCommand(intent,flags,startId);
     }
 
@@ -569,29 +577,29 @@ public abstract class RAService extends Service {
                 // for ActivityCompat#requestPermissions for more details.
 //                return;
             }
-            else
-            {
-
-                initLocation();
-//                mFusedLocationClient = LocationServices.getFusedLocationProviderClient(this);
-//
-//                mLocationCallback = new LocationCallback() {
-//                    @Override
-//                    public void onLocationResult(LocationResult locationResult) {
-//                        super.onLocationResult(locationResult);
-//
-//                        Log.i(TAG, "onLocationResult: " + locationResult.getLastLocation());
-////                    onNewLocation(locationResult.getLastLocation());
-//                    }
-//                };
-//
-//                createLocationRequest();
-//                getLastLocation();
-//
-//
+//            else
+//            {
 //
-//                enable_locationTracing();
-            }
+//                initLocation();
+////                mFusedLocationClient = LocationServices.getFusedLocationProviderClient(this);
+////
+////                mLocationCallback = new LocationCallback() {
+////                    @Override
+////                    public void onLocationResult(LocationResult locationResult) {
+////                        super.onLocationResult(locationResult);
+////
+////                        Log.i(TAG, "onLocationResult: " + locationResult.getLastLocation());
+//////                    onNewLocation(locationResult.getLastLocation());
+////                    }
+////                };
+////
+////                createLocationRequest();
+////                getLastLocation();
+////
+////
+////
+////                enable_locationTracing();
+//            }
 
 
 
@@ -641,73 +649,76 @@ public abstract class RAService extends Service {
 
 
     }
-
-    private void setCurrentLocation(Location location) {
-        mCurrentLocation = location;
-        if (location != null) {
-            mLastNotNullLocation = location;
-        }
-
-        if (locationCallback != null) {
-            locationCallback.onLocationChanged(location);
-        }
-    }
-
+//
+//    private void setCurrentLocation(Location location) {
+//        mCurrentLocation = location;
+//        if (location != null) {
+//            mLastNotNullLocation = location;
+//        }
+//
+//        if (locationCallback != null) {
+//            locationCallback.onLocationChanged(location);
+//        }
+//    }
+//
     public Location getCurrentLocation() {
-        if ((service_flag & FLAG_SERVICE_LOCATION) == FLAG_SERVICE_LOCATION) {
-            return mCurrentLocation;
-        }
-        return null;
+        return null;// 此接口将去掉
+//        if ((service_flag & FLAG_SERVICE_LOCATION) == FLAG_SERVICE_LOCATION) {
+//            return mCurrentLocation;
+//        }
+//        return null;
     }
-
+//
     public Location getLastKnownLocation() {
-        if ((service_flag & FLAG_SERVICE_LOCATION) == FLAG_SERVICE_LOCATION) {
-            return mLastNotNullLocation;
-        }
-        return null;
-    }
-
-    public void initLocation() {
-
-        if (System_Location_Flag) {
-
-            SystemLocation.sharedLocation().adjustLocation = true;
-            SystemLocation.sharedLocation().requestLocation(getApplicationContext(), new SystemLocation.SystemLocationChangeCallback() {
-                @Override
-                public void onLocationChanged(Location location) {
-
-                    Log.d(TAG, "onLocationChanged: " + location);
-                    setCurrentLocation(location);
-                }
-            });
-
-        } else {
-
-            if(mFusedLocationClient!=null)
-                return;
-            Log.d(TAG, "initLocation: ");
-            mFusedLocationClient = LocationServices.getFusedLocationProviderClient(this);
-
-            mLocationCallback = new LocationCallback() {
-                @Override
-                public void onLocationResult(LocationResult locationResult) {
-                    super.onLocationResult(locationResult);
-
-                    Log.i(TAG, "FusedLocationClient onLocationResult: " + locationResult.getLastLocation());
-//                    onNewLocation(locationResult.getLastLocation());
-
-                    Location location = locationResult.getLastLocation();
-                    setCurrentLocation(location);
-                }
-            };
-
-            createLocationRequest();
-            getLastLocation();
-
-        }
-
 
+        return null; // 此接口将去掉
+//        if ((service_flag & FLAG_SERVICE_LOCATION) == FLAG_SERVICE_LOCATION) {
+//            return mLastNotNullLocation;
+//        }
+//        return null;
     }
+//
+//    public void initLocation() {
+//
+//        if (System_Location_Flag) {
+//
+//            SystemLocation.sharedLocation().adjustLocation = true;
+//            SystemLocation.sharedLocation().requestLocation(getApplicationContext(), new SystemLocation.SystemLocationChangeCallback() {
+//                @Override
+//                public void onLocationChanged(Location location) {
+//
+//                    Log.d(TAG, "onLocationChanged: " + location);
+//                    setCurrentLocation(location);
+//                }
+//            });
+//
+//        } else {
+//
+//            if(mFusedLocationClient!=null)
+//                return;
+//            Log.d(TAG, "initLocation: ");
+//            mFusedLocationClient = LocationServices.getFusedLocationProviderClient(this);
+//
+//            mLocationCallback = new LocationCallback() {
+//                @Override
+//                public void onLocationResult(LocationResult locationResult) {
+//                    super.onLocationResult(locationResult);
+//
+//                    Log.i(TAG, "FusedLocationClient onLocationResult: " + locationResult.getLastLocation());
+////                    onNewLocation(locationResult.getLastLocation());
+//
+//                    Location location = locationResult.getLastLocation();
+//                    setCurrentLocation(location);
+//                }
+//            };
+//
+//            createLocationRequest();
+//            getLastLocation();
+//
+//        }
+//
+//
+//    }
 
 
     @Override
@@ -759,24 +770,27 @@ public abstract class RAService extends Service {
                     reachabilityCallback.networkStateChanged(networkInfo);
                 }
 
-            } else
-                if (RABroadcast.ACTION_LOCATION_ENABLE_TRACING.equals(action)) {
-                enable_locationTracing();
-            } else
-                if (RABroadcast.ACTION_LOCATION_DISABLE_TRACING
-                    .equals(action)) {
-
-                disable_locationTracing();
-            } else
-                if (RABroadcast.ACTION_LOCATION_REQUEST_LOCATION
-                    .equals(action)) {
-
-
-                String receiverID = intent.getStringExtra("receiverID");
-//                locationManager.requestSingleUpdate();
-                request_location(receiverID);
-//                locationCallback.onLocationChanged();
             }
+
+            //=============去掉 servicelocation==================
+//            else
+//                if (RABroadcast.ACTION_LOCATION_ENABLE_TRACING.equals(action)) {
+//                enable_locationTracing();
+//            } else
+//                if (RABroadcast.ACTION_LOCATION_DISABLE_TRACING
+//                    .equals(action)) {
+//
+//                disable_locationTracing();
+//            } else
+//                if (RABroadcast.ACTION_LOCATION_REQUEST_LOCATION
+//                    .equals(action)) {
+//
+//
+//                String receiverID = intent.getStringExtra("receiverID");
+////                locationManager.requestSingleUpdate();
+//                request_location(receiverID);
+////                locationCallback.onLocationChanged();
+//            }
             /*
             else if (RABroadcast.ACTION_PUSHNOTIFICATION_CHECK.equals(action)) {
 
@@ -894,129 +908,133 @@ public abstract class RAService extends Service {
 //
 //    }
 
-
-    void disable_locationTracing() {
-
-
-        backgroundLocationTracing = false;
-        if (System_Location_Flag) {
-
-            removeLocationUpdates();
-
-        } else {
-
-
-            removeLocationUpdates();
-//        locationManager.removeUpdates(locationListener);
-        }
-    }
-
-
-    void enable_locationTracing() {
-
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-            // TODO: Consider calling
-            //    ActivityCompat#requestPermissions
-            // here to request the missing permissions, and then overriding
-            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
-            //                                          int[] grantResults)
-            // to handle the case where the user grants the permission. See the documentation
-            // for ActivityCompat#requestPermissions for more details.
-            return;
-        }
-
-        backgroundLocationTracing = true;
-        if (System_Location_Flag) {
-
-            initLocation();
-
-        } else {
-
-            Log.d(TAG, "enable_locationTracing: ");
-            initLocation();
-            requestLocationUpdates();
-//        locationManager.requestLocationUpdates(
-//                "fused", timeInterval, distance,
-//                locationListener);
-//        if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+//========= 去掉 service location====================
 //
+//    void disable_locationTracing() {
 //
 //
+//        backgroundLocationTracing = false;
+//        if (System_Location_Flag) {
 //
-//        } else if (locationManager
-//                .isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
+//            removeLocationUpdates();
 //
+//        } else {
 //
-//            locationManager.requestLocationUpdates(
-//                    LocationManager.NETWORK_PROVIDER, timeInterval, distance,
-//                    locationListener);
 //
+//            removeLocationUpdates();
+////        locationManager.removeUpdates(locationListener);
 //        }
-
-        }
-
-    }
-
+//    }
+//
+//
+//    void enable_locationTracing() {
+//
+//        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+//            // TODO: Consider calling
+//            //    ActivityCompat#requestPermissions
+//            // here to request the missing permissions, and then overriding
+//            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+//            //                                          int[] grantResults)
+//            // to handle the case where the user grants the permission. See the documentation
+//            // for ActivityCompat#requestPermissions for more details.
+//            return;
+//        }
+//
+//        backgroundLocationTracing = true;
+//        if (System_Location_Flag) {
+//
+//            initLocation();
+//
+//        } else {
+//
+//            Log.d(TAG, "enable_locationTracing: ");
+//            initLocation();
+//            requestLocationUpdates();
+////        locationManager.requestLocationUpdates(
+////                "fused", timeInterval, distance,
+////                locationListener);
+////        if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+////
+////
+////
+////
+////        } else if (locationManager
+////                .isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
+////
+////
+////            locationManager.requestLocationUpdates(
+////                    LocationManager.NETWORK_PROVIDER, timeInterval, distance,
+////                    locationListener);
+////
+////        }
+//
+//        }
+//
+//    }
+//
     protected Location request_cachedlocation() {
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-
-            return null;
-        }
 
+        return null; //此接口将去掉
 
-        //使用GPS获取上一次的地址，这样获取到的信息需要多次，才能够显示出来，所以后面有动态的判断
-//        Location location = locationManager.getLastKnownLocation("fused");
-//        return location;
-        return null;
+//        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+//
+//            return null;
+//        }
+//
+//
+//        //使用GPS获取上一次的地址，这样获取到的信息需要多次，才能够显示出来，所以后面有动态的判断
+////        Location location = locationManager.getLastKnownLocation("fused");
+////        return location;
+//        return null;
 
     }
 
-    protected void request_location(final String receiverID) {
-
-
-        if (receiverID == null)
-            throw new IllegalArgumentException("receiverID can't be null");
-
-
-        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-            // TODO: Consider calling
-            //    ActivityCompat#requestPermissions
-            // here to request the missing permissions, and then overriding
-            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
-            //                                          int[] grantResults)
-            // to handle the case where the user grants the permission. See the documentation
-            // for ActivityCompat#requestPermissions for more details.
-            return;
-        }
-
-        backgroundLocationTracing = true;
-        if (System_Location_Flag) {
-
-            initLocation();
-
-        } else {
-
-            initLocation();
-            requestLocationUpdates();
-//        locationManager.requestLocationUpdates(
-//                "fused", timeInterval, distance,
-//                locationListener);
-//        if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+//    protected void request_location(final String receiverID) {
 //
 //
+//        if (receiverID == null)
+//            throw new IllegalArgumentException("receiverID can't be null");
 //
 //
-//        } else if (locationManager
-//                .isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
+//        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+//            // TODO: Consider calling
+//            //    ActivityCompat#requestPermissions
+//            // here to request the missing permissions, and then overriding
+//            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+//            //                                          int[] grantResults)
+//            // to handle the case where the user grants the permission. See the documentation
+//            // for ActivityCompat#requestPermissions for more details.
+//            return;
+//        }
+//
+//        backgroundLocationTracing = true;
+//        if (System_Location_Flag) {
 //
+//            initLocation();
 //
-//            locationManager.requestLocationUpdates(
-//                    LocationManager.NETWORK_PROVIDER, timeInterval, distance,
-//                    locationListener);
+//        } else {
+//
+//            initLocation();
+//            requestLocationUpdates();
+////        locationManager.requestLocationUpdates(
+////                "fused", timeInterval, distance,
+////                locationListener);
+////        if (locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+////
+////
+////
+////
+////        } else if (locationManager
+////                .isProviderEnabled(LocationManager.NETWORK_PROVIDER)) {
+////
+////
+////            locationManager.requestLocationUpdates(
+////                    LocationManager.NETWORK_PROVIDER, timeInterval, distance,
+////                    locationListener);
+////
+////        }
 //
 //        }
-
-        }
-
-    }
+//
+//    }
 }

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/signature/SignatureActivity.java

@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.view.Menu;
@@ -42,7 +42,7 @@ public class SignatureActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.ra_signature_activity);
 
-        android.support.v7.app.ActionBar actionBar = getSupportActionBar();
+        androidx.appcompat.app.ActionBar actionBar = getSupportActionBar();
         if(actionBar != null){
             actionBar.setHomeButtonEnabled(true);
             actionBar.setDisplayHomeAsUpEnabled(true);

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/signature/SignatureView.java

@@ -9,7 +9,7 @@ import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.Log;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/upload/UploadListActivity.java

@@ -9,12 +9,12 @@ import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/utils/FileManager.java

@@ -6,7 +6,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
@@ -16,7 +16,6 @@ import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/utils/ImageUtil.java

@@ -10,7 +10,7 @@ import android.graphics.Matrix;
 import android.graphics.drawable.Drawable;
 import android.media.ExifInterface;
 import android.net.Uri;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.util.Log;
 
 import java.io.BufferedOutputStream;

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/utils/RAUtil.java

@@ -17,9 +17,9 @@ import android.location.LocationManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.PermissionChecker;
-import android.support.v7.app.AlertDialog;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.PermissionChecker;
+import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;

ApexDrivers/RAUtilsLibrary/src/main/res/layout/actionbar_customtitle.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -21,4 +21,4 @@
         app:layout_constraintHorizontal_bias="0.6"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.ConstraintLayout>

ApexDrivers/RAUtilsLibrary/src/main/res/layout/file_viewer_activity.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -15,4 +15,4 @@
         />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.ConstraintLayout>

ApexDrivers/RAUtilsLibrary/src/main/res/layout/pdf_preview_activity.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -11,4 +11,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.ConstraintLayout>

ApexDrivers/RAUtilsLibrary/src/main/res/layout/ra_signature_activity.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -13,4 +13,4 @@
         android:layout_height="match_parent"
         />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.ConstraintLayout>

ApexDrivers/RAUtilsLibrary/src/main/res/layout/upload_list_activity.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -20,4 +20,4 @@
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.ConstraintLayout>

ApexDrivers/RAUtilsLibrary/src/test/java/com/usai/redant/rautils/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package com.usai.redant.rautils;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}