Kaynağa Gözat

1.修改Android Apex Driver系统定位和Google定位开关。

Pen Li 7 yıl önce
ebeveyn
işleme
faecef2d48

+ 4 - 2
ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/service/RAService.java

@@ -61,7 +61,7 @@ public abstract class RAService extends Service {
     public static final int FLAG_SERVICE_REACHABILITY = 1 << 4;
 //    public static final int FLAG_LOCATION_SERVICE = 1<<1;
 
-    private static final boolean System_Location_Flag = true;
+    private static boolean System_Location_Flag = false;
 
     private Location mCurrentLocation; // 当前定位位置,可为空
     private Location mLastNotNullLocation; // 最后一次获取的非空Location
@@ -141,7 +141,9 @@ public abstract class RAService extends Service {
 //		public abstract void onLogout();
     }
 
-    public void initServiceLocation(ServiceLocation locationCallback) {
+    public void initServiceLocation(boolean systemLocation, ServiceLocation locationCallback) {
+        System_Location_Flag = systemLocation;
+
         service_flag = service_flag | FLAG_SERVICE_LOCATION;
         this.locationCallback = locationCallback;
     }

+ 6 - 0
ApexDrivers/apexdriverscn/src/main/java/com/usai/apex/apexdriverscn/ApplicationCN.java

@@ -18,4 +18,10 @@ public class ApplicationCN extends ApexDriverApplication {
 
         return MainActivityCN.class;
     }
+
+    @Override
+    public boolean isbUseSystemLocation() {
+
+        return true;
+    }
 }

+ 5 - 0
ApexDrivers/apexdriversi/src/main/java/com/usai/apex/apexdriversi/ApplicationI.java

@@ -16,4 +16,9 @@ public class ApplicationI extends ApexDriverApplication {
     public Class getMainActivityClass() {
         return MainActivityI.class;
     }
+
+    @Override
+    public boolean isbUseSystemLocation() {
+        return false;
+    }
 }

+ 5 - 0
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/ApexDriverApplication.java

@@ -81,6 +81,11 @@ public class ApexDriverApplication extends Application {
 
     public boolean enableOffline = false;
 
+    public boolean isbUseSystemLocation() {
+
+        return false;
+    };
+
     public void initLocation()
     {
         if(mService!=null)

+ 1 - 1
ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/ApexDriversBackgroundService.java

@@ -61,7 +61,7 @@ public class ApexDriversBackgroundService extends RAService implements RAService
 
         CHANNEL_ID=ApexDriverApplication.sharedApplication().CHANNEL_ID;
         CHANNEL_NAME=ApexDriverApplication.sharedApplication().CHANNEL_NAME;
-        initServiceLocation(this);
+        initServiceLocation(ApexDriverApplication.sharedApplication().isbUseSystemLocation(),this);
 //        initServiceNotification(this,"replace this string with notification checking url");
 
         RAUploadManager.configureUploadManager(getApplicationContext(), new RAUploadManager.configureBlock() {