UPDATE flutter-hms-analytics 6.9.0+302

ozkulbeng · web-flow · commit cba2b1b8c753 · 2023-03-03T14:01:58.000+03:00
diff --git a/flutter-hms-analytics/CHANGELOG.md b/flutter-hms-analytics/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 6.9.0+302
+
+- Added the **getDataUploadSiteInfo** API to the HiAnalyticsInstance class to support the Global Router Service (GRS) function.
+
+- **Breaking Changes:**
+  - Modified the internal structure of the plugin. Please use import **package:huawei_analytics/huawei_analytics.dart** not to get any errors.
+
 ## 6.5.0+301
 
 - **Breaking Change:** Added the `getInstance({String routePolicy})` method. With this version `getInstance` method must be called from the application to initialize plugin in iOS platform.
diff --git a/flutter-hms-analytics/README.md b/flutter-hms-analytics/README.md
@@ -45,7 +45,7 @@ Please see [pub.dev](https://pub.dev/packages/huawei_analytics/install) and [App
 
 ### Additional Topics
 
-- [Enabling HUAWEI Analytics Service](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/config-agc-0000001050171095#EN-US_TOPIC_0000001050171095__section118755594146?ha_source=hms1)
+- [Enabling Huawei Analytics Service](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/config-agc-0000001050171095#EN-US_TOPIC_0000001050171095__section118755594146?ha_source=hms1)
 - Setup
   - [Android Setup](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/android-setup-0000001058644236?ha_source=hms1)
   - [iOS Setup](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/ios-setup-0000001058804234?ha_source=hms1)
diff --git a/flutter-hms-analytics/android/build.gradle b/flutter-hms-analytics/android/build.gradle
@@ -41,5 +41,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.huawei.hms:hianalytics:6.5.0.300'
+    implementation 'com.huawei.hms:hianalytics:6.9.0.302'
 }
diff --git a/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/AnalyticsContentProvider.java b/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/AnalyticsContentProvider.java
@@ -1,5 +1,5 @@
 /*
-    Copyright 2020-2022. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2023. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.
diff --git a/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/AnalyticsPlugin.java b/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/AnalyticsPlugin.java
@@ -1,5 +1,5 @@
 /*
-    Copyright 2020-2022. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2023. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.
@@ -27,17 +27,11 @@
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.common.PluginRegistry;
 
 public class AnalyticsPlugin implements FlutterPlugin {
     private HMSAnalyticsMethodCallHandler analyticsMethodCallHandler;
     private MethodChannel channel;
 
-    public static void registerWith(PluginRegistry.Registrar registrar) {
-        final AnalyticsPlugin instance = new AnalyticsPlugin();
-        instance.onAttachedToEngine(registrar.context(), registrar.messenger());
-    }
-
     @Override
     public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
         onAttachedToEngine(flutterPluginBinding.getApplicationContext(), flutterPluginBinding.getBinaryMessenger());
diff --git a/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/HMSAnalyticsModule.java b/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/HMSAnalyticsModule.java
@@ -1,5 +1,5 @@
 /*
-    Copyright 2020-2022. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2023. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.
@@ -253,6 +253,10 @@ public void getInstance(MethodCall methodCall, Result result) {
         result.success(null);
     }
 
+    public void getDataUploadSiteInfo(Result result) {
+        viewModel.getDataUploadSiteInfo(new HMSAnalyticsModule.HMSAnalyticsResultHandler<>(result, "getDataUploadSiteInfo", weakContext));
+    }
+
     /* Private Inner Class */
 
     private Set<ReportPolicy> mapToSetReportPolicy(Map<String, Object> reportPolicies) {
@@ -317,9 +321,9 @@ private enum LogLevel {
      */
     private static final class HMSAnalyticsResultHandler<Object>
             implements HMSAnalyticsContract.ResultListener<Object> {
-        private Result mResult;
-        private String mMethodName;
-        private WeakReference<Context> mWeakContext;
+        private final Result mResult;
+        private final String mMethodName;
+        private final WeakReference<Context> mWeakContext;
 
         HMSAnalyticsResultHandler(final Result result, String methodName, WeakReference<Context> weakContext) {
             this.mResult = result;
diff --git a/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/handler/HMSAnalyticsMethodCallHandler.java b/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/handler/HMSAnalyticsMethodCallHandler.java
@@ -1,5 +1,5 @@
 /*
-    Copyright 2020-2022. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2023. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.
@@ -159,6 +159,10 @@ public void onMethodCall(@NonNull MethodCall methodCall, @NonNull Result result)
                 analyticsModule.getInstance(methodCall, result);
                 HMSLogger.getInstance(weakContext.get()).sendSingleEvent(methodCall.method);
                 break;
+            case getDataUploadSiteInfo:
+                analyticsModule.getDataUploadSiteInfo(result);
+                HMSLogger.getInstance(weakContext.get()).sendSingleEvent(methodCall.method);
+                break;
             default:
                 result.error("platformError", "Not supported on Android platform", "");
         }
@@ -192,6 +196,7 @@ private enum Methods {
         setChannel,
         setPropertyCollection,
         setCustomReferrer,
-        getInstance
+        getInstance,
+        getDataUploadSiteInfo
     }
 }
diff --git a/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/logger/HMSLogger.java b/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/logger/HMSLogger.java
@@ -1,5 +1,5 @@
 /*
-    Copyright 2020-2022. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2023. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public final class HMSLogger {
 
     private static final String KIT = "Analytics";
     private static final String PLATFORM = "Flutter";
-    private static final String VERSION = "6.5.0.301";
+    private static final String VERSION = "6.9.0.302";
 
     private static final String SERVICE = "Cross-Platform";
 
diff --git a/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/presenter/HMSAnalyticsContract.java b/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/presenter/HMSAnalyticsContract.java
@@ -1,5 +1,5 @@
 /*
-    Copyright 2020-2022. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2023. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.
@@ -23,14 +23,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import io.flutter.plugin.common.MethodCall;
-import io.flutter.plugin.common.MethodChannel;
-
-/**
- * HMSAnalyticsContract defines a blueprint of {@link HMSAnalyticsModule} methods that will be exposed to Flutter Side.
- *
- * @since v.5.1.0
- */
 public interface HMSAnalyticsContract {
     /**
      * Defines blueprints of {@link HMSAnalyticsViewModel} methods
@@ -174,20 +166,20 @@ interface Presenter {
         void getReportPolicyThreshold(final HMSAnalyticsContract.ResultListener<Long> resultListener, ReportPolicy reportPolicyType);
 
         /**
-         * Specifies whether to enable restriction of HUAWEI Analytics.
+         * Specifies whether to enable restriction of Huawei Analytics.
          * <p>
-         * The default value is false, which indicates that HUAWEI Analytics is enabled by default.
+         * The default value is false, which indicates that Huawei Analytics is enabled by default.
          *
-         * @param isEnabled: Indicates whether to enable restriction of HUAWEI Analytics.
+         * @param isEnabled: Indicates whether to enable restriction of Huawei Analytics.
          */
         void setRestrictionEnabled(final boolean isEnabled);
 
         /**
-         * Obtains the restriction status of HUAWEI Analytics.
+         * Obtains the restriction status of Huawei Analytics.
          *
          * @param resultListener: In the success scenario, {@link HMSAnalyticsContract.ResultListener<Boolean>} instance
          *                        is returned via listener. {@param resultListener} that obtains the restriction status
-         *                        of HUAWEI Analytics.
+         *                        of Huawei Analytics.
          */
         void isRestrictionEnabled(final HMSAnalyticsContract.ResultListener<Boolean> resultListener);
 
@@ -262,6 +254,15 @@ interface Presenter {
          */
         void enableLog();
 
+        /**
+         * Obtains the app instance ID from AppGallery Connect.
+         *
+         * @param resultListener: In the success scenario, {@link HMSAnalyticsContract.ResultListener<String>} instance
+         *                        is returned via listener. {@param resultListener} that obtains the processing location
+         *                        of the uploaded data.
+         */
+        void getDataUploadSiteInfo(final HMSAnalyticsContract.ResultListener<String> resultListener);
+
     }
 
     /**
diff --git a/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/utils/MapUtils.java b/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/utils/MapUtils.java
@@ -1,5 +1,5 @@
 /*
-    Copyright 2020-2022. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2023. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.
@@ -120,7 +120,11 @@ public static Bundle mapToBundle(@Nullable Map<String, Object> map, boolean isNe
                     Log.e(TAG, "Illegal value type. Key :" + key + ", only one nested bundle structure is allowed.");
                 }
             } else if (val instanceof List) {
-                handleList(bundle, key, (List<?>) val);
+                if(((List<?>) val).size() != 0) {
+                    handleList(bundle, key, (List<?>) val);
+                } else {
+                    Log.e(TAG, "Illegal value type. Key:" + key + ", must not be empty.");
+                }
             } else {
                 throw new IllegalArgumentException(
                     "Illegal value type. Key :" + key + ", valueType : " + val.getClass().getSimpleName());
diff --git a/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/viewmodel/HMSAnalyticsViewModel.java b/flutter-hms-analytics/android/src/main/java/com/huawei/hms/flutter/analytics/viewmodel/HMSAnalyticsViewModel.java
@@ -1,5 +1,5 @@
 /*
-    Copyright 2020-2022. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2023. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.
@@ -29,11 +29,6 @@
 import java.util.Map;
 import java.util.Set;
 
-/**
- * HMSAnalyticsViewModel works as a mediator between {@link HMSAnalyticsContract.Presenter} .
- *
- * @since v.5.1.0
- */
 public class HMSAnalyticsViewModel implements HMSAnalyticsContract.Presenter {
 
     // HiAnalytics instance
@@ -170,6 +165,10 @@ public void enableLog() {
         HiAnalyticsTools.enableLog();
     }
 
+    @Override
+    public void getDataUploadSiteInfo(ResultListener<String> resultListener) {
+        resultListener.onSuccess(analyticsInstance.getDataUploadSiteInfo());
+    }
 
 }
 
diff --git a/flutter-hms-analytics/example/android/app/src/main/java/com/huawei/hms/flutter/analytics_example/MainActivity.java b/flutter-hms-analytics/example/android/app/src/main/java/com/huawei/hms/flutter/analytics_example/MainActivity.java
@@ -1,5 +1,5 @@
 /*
-    Copyright 2020-2022. Huawei Technologies Co., Ltd. All rights reserved.
+    Copyright 2020-2023. Huawei Technologies Co., Ltd. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License")
     you may not use this file except in compliance with the License.
diff --git a/flutter-hms-analytics/example/android/build.gradle b/flutter-hms-analytics/example/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.0'
-        classpath 'com.huawei.agconnect:agcp:1.6.5.300'
+        classpath 'com.huawei.agconnect:agcp:1.8.0.300'
     }
 }
 
diff --git a/flutter-hms-analytics/example/lib/main.dart b/flutter-hms-analytics/example/lib/main.dart
diff --git a/flutter-hms-analytics/example/pubspec.yaml b/flutter-hms-analytics/example/pubspec.yaml
diff --git a/flutter-hms-analytics/lib/huawei_analytics.dart b/flutter-hms-analytics/lib/huawei_analytics.dart
diff --git a/flutter-hms-analytics/lib/src/constants/analytics_constants.dart b/flutter-hms-analytics/lib/src/constants/analytics_constants.dart
diff --git a/flutter-hms-analytics/lib/src/hms_analytics.dart b/flutter-hms-analytics/lib/src/hms_analytics.dart
diff --git a/flutter-hms-analytics/pubspec.yaml b/flutter-hms-analytics/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ android {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`dependencies {`
`44`		`- implementation 'com.huawei.hms:hianalytics:6.5.0.300'`
	`44`	`+ implementation 'com.huawei.hms:hianalytics:6.9.0.302'`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`
`8`	`8`	`dependencies {`
`9`	`9`	`classpath 'com.android.tools.build:gradle:3.6.0'`
`10`		`- classpath 'com.huawei.agconnect:agcp:1.6.5.300'`
	`10`	`+ classpath 'com.huawei.agconnect:agcp:1.8.0.300'`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`