Android 返回 shouldRetry

Author: wenkiwu

README.md

@@ -184,7 +184,7 @@ swift代码：
 
 示例：
 ``` dart
-Future wakeupHandler(Map<String, dynamic> data) async {
+Future wakeupHandler(Map<String, Object> data) async {
     setState(() {
         debugLog = "wakeup result : channel=" +
             data['channelCode'] +
@@ -203,7 +203,7 @@ _openinstallFlutterPlugin.init(wakeupHandler);
 示例：
 ``` dart
 
-Future installHandler(Map<String, dynamic> data) async {
+Future installHandler(Map<String, Object> data) async {
     setState(() {
         debugLog = "install result : channel=" +
             data['channelCode'] +

android/src/main/java/io/openinstall/openinstall_flutter_plugin/OpeninstallFlutterPlugin.java

@@ -120,21 +120,23 @@ public void onMethodCall(MethodCall call, @NonNull final Result result) {
             OpenInstall.getInstall(new AppInstallListener() {
                 @Override
                 public void onInstallFinish(AppData appData, Error error) {
-                    Map<String, String> data = data2Map(appData);
+                    Map<String, Object> data = data2Map(appData);
                     boolean shouldRetry = error!=null && error.shouldRetry();
-                    data.put("shouldRetry", String.valueOf(shouldRetry));
-                    channel.invokeMethod(METHOD_INSTALL_NOTIFICATION,data );
+                    data.put("shouldRetry", shouldRetry);
+                    if(error != null) {
+                        data.put("message", error.getErrorMsg());
+                    }
+                    channel.invokeMethod(METHOD_INSTALL_NOTIFICATION, data);
                 }
             }, seconds == null ? 0 : seconds);
             result.success("OK");
         } else if (METHOD_INSTALL_RETRY.equalsIgnoreCase(call.method)) {
             Integer seconds = call.argument("seconds");
             OpenInstall.getInstallCanRetry(new AppInstallRetryAdapter() {
                 @Override
-                public void onInstall(AppData appData, boolean retry) {
-                    Map<String, String> data = data2Map(appData);
-                    data.put("retry", String.valueOf(retry));
-                    data.put("shouldRetry", String.valueOf(retry));  // 以后保存统一
+                public void onInstall(AppData appData, boolean shouldRetry) {
+                    Map<String, Object> data = data2Map(appData);
+                    data.put("shouldRetry", shouldRetry);  // 以后保存统一
                     channel.invokeMethod(METHOD_INSTALL_NOTIFICATION, data);
                 }
             }, seconds == null ? 0 : seconds);
@@ -156,17 +158,17 @@ public void onInstall(AppData appData, boolean retry) {
         } else if (METHOD_SHARE.equalsIgnoreCase(call.method)) {
             String shareCode = call.argument("shareCode");
             String sharePlatform = call.argument("platform");
-            final Map<String, String> data = new HashMap<>();
+            final Map<String, Object> data = new HashMap<>();
             if(TextUtils.isEmpty(shareCode) || TextUtils.isEmpty(sharePlatform)){
                 data.put("message",  "shareCode or platform is empty");
-                data.put("shouldRetry", String.valueOf(false));
+                data.put("shouldRetry", false);
                 result.success(data);
             }else {
                 OpenInstall.reportShare(shareCode, sharePlatform, new ResultCallback<Void>() {
                     @Override
                     public void onResult(@Nullable Void v, @Nullable Error error) {
                         boolean shouldRetry = error!=null && error.shouldRetry();
-                        data.put("shouldRetry", String.valueOf(shouldRetry));
+                        data.put("shouldRetry", shouldRetry);
                         if(error != null) {
                             data.put("message", error.getErrorMsg());
                         }
@@ -318,8 +320,8 @@ public boolean onRequestPermissionsResult(int requestCode, String[] permissions,
                 }
             };
 
-    private static Map<String, String> data2Map(AppData data) {
-        Map<String, String> result = new HashMap<>();
+    private static Map<String, Object> data2Map(AppData data) {
+        Map<String, Object> result = new HashMap<>();
         if (data != null) {
             result.put("channelCode", data.getChannel());
             result.put("bindData", data.getData());

example/.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\op-github\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"android":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\op-github\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"openinstall_flutter_plugin","dependencies":[]}],"date_created":"2023-04-11 16:28:16.921725","version":"2.8.1"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\op-github\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"android":[{"name":"openinstall_flutter_plugin","path":"D:\\\\workspace\\\\op-github\\\\openinstall_flutter_plugin\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"openinstall_flutter_plugin","dependencies":[]}],"date_created":"2023-04-13 13:02:05.597240","version":"2.8.1"}