Merge pull request #712 from TakayukiHoshi1984/modify_fused_location

GeolocationProfileでFusedLocationの対応

Author: masaru-takano

dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle

@@ -100,6 +100,8 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-livedata:2.2.0'
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
+    implementation 'com.google.android.gms:play-services-location:18.0.0'
+    implementation 'com.google.android.gms:play-services-maps:17.0.1'
     implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:1.9.7'
     implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.6'
     implementation 'org.deviceconnect:dconnect-demo-lib:1.0.1'

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/AndroidManifest.xml

@@ -126,7 +126,9 @@
         <!-- プラグイン本体サービス -->
         <service
             android:name=".HostDevicePlugin"
-            android:exported="true">
+            android:exported="true"
+
+            android:foregroundServiceType="location">
             <meta-data
                 android:name="org.deviceconnect.android.deviceplugin"
                 android:resource="@xml/org_deviceconnect_android_deviceplugin_host" />

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/GeolocationAlertDialogActivity.java

@@ -54,6 +54,12 @@ public void onCreate(Bundle savedInstanceState) {
                                     android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS);
                             try {
                                 startActivity(callGPSSettingIntent);
+                                if (mResponse != null) {
+                                    MessageUtils.setIllegalDeviceStateError(mResponse,
+                                            "Please retry running Geolocation.");
+                                    getBaseContext().sendBroadcast(mResponse);
+                                }
+
                             } catch (ActivityNotFoundException e) {
                                 if (mResponse != null) {
                                     MessageUtils.setIllegalDeviceStateError(mResponse,

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/profile/HostGeolocationProfile.java

@@ -3,7 +3,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
@@ -17,6 +17,6 @@ allprojects {
     repositories {
         maven { url 'https://jitpack.io' }
         google()
-        jcenter()
+        mavenCentral()
     }
 }

dConnectManager/dConnectManager/build.gradle

@@ -304,7 +304,7 @@ public void onError(final Exception e) {
             }
         }
     }
-   /**
+    /*
      * DConnectManagerを停止します.
      */
     private void stopManager() {

dConnectManager/dConnectManager/dconnect-manager-app/src/main/java/org/deviceconnect/android/manager/DConnectService.java

@@ -1,6 +1,6 @@
-#Mon Apr 20 11:14:05 JST 2020
+#Tue Jul 13 12:04:58 JST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

dConnectManager/dConnectManager/gradle/wrapper/gradle-wrapper.properties

@@ -15,7 +15,7 @@ def getArtificatId = { ->
 
 android {
     compileSdkVersion 29
-    ndkVersion "21.0.6113669"
+    ndkVersion '21.4.7075529'
 
     defaultConfig {
         minSdkVersion 21