Skip to content

Commit f80ee7a

Browse files
committed
移除废弃的接口
1 parent 38acb33 commit f80ee7a

File tree

5 files changed

+21
-101
lines changed

5 files changed

+21
-101
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
## 2.4.5
2-
Android 更新 SDK 到 2.8.3
1+
## 2.5.0
2+
Android 更新 SDK 到 2.8.3
3+
彻底移除了废弃的接口
34

45
## 2.4.4
56
iOS 集成文档更新

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

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,12 @@
3737
public class OpeninstallFlutterPlugin implements FlutterPlugin, MethodCallHandler, ActivityAware, PluginRegistry.NewIntentListener {
3838

3939
private static final String TAG = "OpenInstallPlugin";
40-
41-
@Deprecated
42-
private static final String METHOD_INIT_PERMISSION = "initWithPermission";
4340
@Deprecated
4441
private static final String METHOD_WAKEUP = "registerWakeup";
4542

4643
private static final String METHOD_DEBUG = "setDebug";
4744
private static final String METHOD_CONFIG = "config";
4845
private static final String METHOD_CLIPBOARD_ENABLED = "clipBoardEnabled";
49-
private static final String METHOD_SERIAL_ENABLED = "serialEnabled";
5046
private static final String METHOD_INIT = "init";
5147
private static final String METHOD_INSTALL_RETRY = "getInstallCanRetry";
5248
private static final String METHOD_INSTALL = "getInstall";
@@ -107,21 +103,13 @@ public void onMethodCall(MethodCall call, @NonNull final Result result) {
107103
Boolean enabled = call.argument("enabled");
108104
OpenInstall.clipBoardEnabled(enabled == null ? true : enabled);
109105
result.success("OK");
110-
} else if (METHOD_SERIAL_ENABLED.equalsIgnoreCase(call.method)) {
111-
Boolean enabled = call.argument("enabled");
112-
OpenInstall.serialEnabled(enabled == null ? true : enabled);
113-
result.success("OK");
114106
} else if (METHOD_INIT.equalsIgnoreCase(call.method)) {
115107
Boolean box = call.argument("alwaysCallback");
116108
alwaysCallback = box == null ? false : box;
117109
init();
118110
result.success("OK");
119-
} else if (METHOD_INIT_PERMISSION.equalsIgnoreCase(call.method)) {
120-
Boolean box = call.argument("alwaysCallback");
121-
alwaysCallback = box == null ? false : box;
122-
initWithPermission();
123-
result.success("OK");
124111
} else if (METHOD_WAKEUP.equalsIgnoreCase(call.method)) {
112+
// iOS 使用此接口初始化,继续保留
125113
result.success("OK");
126114
} else if (METHOD_INSTALL.equalsIgnoreCase(call.method)) {
127115
Integer seconds = call.argument("seconds");
@@ -267,23 +255,6 @@ private void init() {
267255
}
268256
}
269257

270-
@Deprecated
271-
private void initWithPermission() {
272-
Activity activity = activityPluginBinding.getActivity();
273-
activityPluginBinding.addRequestPermissionsResultListener(permissionsResultListener);
274-
OpenInstall.initWithPermission(activity, configuration, new Runnable() {
275-
@Override
276-
public void run() {
277-
activityPluginBinding.removeRequestPermissionsResultListener(permissionsResultListener);
278-
initialized = true;
279-
if (intentHolder != null) {
280-
wakeup(intentHolder);
281-
intentHolder = null;
282-
}
283-
}
284-
});
285-
}
286-
287258
@Override
288259
public boolean onNewIntent(Intent intent) {
289260
debugLog("onNewIntent");
@@ -318,16 +289,6 @@ public void onWakeUp(AppData appData) {
318289
}
319290
}
320291

321-
@Deprecated
322-
private final PluginRegistry.RequestPermissionsResultListener permissionsResultListener =
323-
new PluginRegistry.RequestPermissionsResultListener() {
324-
@Override
325-
public boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
326-
OpenInstall.onRequestPermissionsResult(requestCode, permissions, grantResults);
327-
return false;
328-
}
329-
};
330-
331292
private static Map<String, Object> data2Map(AppData data) {
332293
Map<String, Object> result = new HashMap<>();
333294
if (data != null) {

example/lib/main.dart

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,24 +107,17 @@ class _MyAppState extends State<MyApp> {
107107
Future installHandler(Map<String, Object> data) async {
108108
print("installHandler : " + data.toString());
109109
setState(() {
110-
installLog = "install result : channel=" +
111-
data['channelCode'].toString() +
112-
", data=" +
113-
data['bindData'].toString() +
114-
"\n" +
115-
data['shouldRetry'].toString();
110+
installLog = "install result : channel=" + data['channelCode'].toString()
111+
+ ", data=" + data['bindData'].toString()
112+
+ ", shouldRetry=" + data['shouldRetry'].toString() + "\n";
116113
});
117-
118114
}
119115

120116
Future wakeupHandler(Map<String, Object> data) async {
121117
print("wakeupHandler : " + data.toString());
122118
setState(() {
123-
wakeUpLog = "wakeup result : channel=" +
124-
data['channelCode'].toString() +
125-
", data=" +
126-
data['bindData'].toString() +
127-
"\n";
119+
wakeUpLog = "wakeup result : channel=" + data['channelCode'].toString()
120+
+ ", data=" + data['bindData'].toString() + "\n";
128121
});
129122
}
130123
}

lib/openinstall_flutter_plugin.dart

Lines changed: 11 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,7 @@ class OpeninstallFlutterPlugin {
2020

2121
static const MethodChannel _channel = const MethodChannel('openinstall_flutter_plugin');
2222

23-
// 已废弃
24-
// 旧版本使用,保留一段时间,防止 npm 自动升级使用最新版本插件出现问题
25-
void config(bool adEnabled, String? oaid, String? gaid) {
26-
print("config(bool adEnabled, String? oaid, String? gaid) 后续版本将移除,请使用configAndroid(Map options)");
27-
if (Platform.isAndroid) {
28-
var args = new Map();
29-
args["adEnabled"] = adEnabled;
30-
args["oaid"] = oaid;
31-
args['gaid'] = gaid;
32-
_channel.invokeMethod('config', args);
33-
} else {
34-
// 仅使用于 Android 平台
35-
}
36-
}
37-
38-
void setDebug(bool enabled){
23+
void setDebug(bool enabled) {
3924
if (Platform.isAndroid) {
4025
var args = new Map();
4126
args["enabled"] = enabled;
@@ -55,7 +40,7 @@ class OpeninstallFlutterPlugin {
5540
}
5641

5742
// 关闭剪切板读取
58-
void clipBoardEnabled(bool enabled){
43+
void clipBoardEnabled(bool enabled) {
5944
if (Platform.isAndroid) {
6045
var args = new Map();
6146
args["enabled"] = enabled;
@@ -65,26 +50,12 @@ class OpeninstallFlutterPlugin {
6550
}
6651
}
6752

68-
// 已废弃
69-
// 关闭SerialNumber读取
70-
void serialEnabled(bool enabled){
71-
print("serialEnabled(bool enabled) 后续版本将移除,请使用configAndroid(Map options)");
72-
if (Platform.isAndroid) {
73-
var args = new Map();
74-
args["enabled"] = enabled;
75-
_channel.invokeMethod('serialEnabled', args);
76-
} else {
77-
// 仅使用于 Android 平台
78-
}
79-
}
80-
81-
82-
//设置参数并初始化
83-
//options可设置参数:
84-
//AdPlatformEnable:必要,是否开启广告平台统计功能
85-
//ASAEnable:必要,是否开启ASA功能
86-
//ASADebug:可选,使用ASA功能时是否开启debug模式,正式环境中请关闭
87-
//idfaStr:可选,用户可以自行传入idfa字符串,不传则插件内部会获取,通过其它插件获取的idfa字符串一般格式为xxxx-xxxx-xxxx-xxxx
53+
//设置参数并初始化
54+
//options可设置参数:
55+
//AdPlatformEnable:必要,是否开启广告平台统计功能
56+
//ASAEnable:必要,是否开启ASA功能
57+
//ASADebug:可选,使用ASA功能时是否开启debug模式,正式环境中请关闭
58+
//idfaStr:可选,用户可以自行传入idfa字符串,不传则插件内部会获取,通过其它插件获取的idfa字符串一般格式为xxxx-xxxx-xxxx-xxxx
8859
void configIos(Map options) {
8960
if (Platform.isAndroid) {
9061
//仅使用于 iOS 平台
@@ -96,25 +67,19 @@ class OpeninstallFlutterPlugin {
9667
// wakeupHandler 拉起回调.
9768
// alwaysCallback 是否总是有回调。当值为true时,只要触发了拉起方法调用,就会有回调
9869
// permission 初始化时是否申请 READ_PHONE_STATE 权限,已废弃。请用户自行进行权限申请
99-
void init(EventHandler wakeupHandler, {bool alwaysCallback = false, bool permission = false}) {
70+
void init(EventHandler wakeupHandler, [bool alwaysCallback = false]) {
10071
_wakeupHandler = wakeupHandler;
10172
_channel.setMethodCallHandler(_handleMethod);
10273
_channel.invokeMethod("registerWakeup");
10374
if (Platform.isAndroid) {
10475
var args = new Map();
10576
args["alwaysCallback"] = alwaysCallback;
106-
if (permission) {
107-
print("initWithPermission 后续版本将移除,请自行进行权限申请");
108-
_channel.invokeMethod("initWithPermission", args);
109-
} else {
110-
_channel.invokeMethod("init", args);
111-
}
77+
_channel.invokeMethod("init", args);
11278
} else {
11379
print("插件版本>=2.3.1后,由于整合了广告和ASA系统,iOS平台将通过用户手动调用init方法初始化SDK,需要广告平台或者ASA统计服务的请在init方法前调用configIos方法配置参数");
11480
}
11581
}
11682

117-
11883
// SDK内部将会一直保存安装数据,每次调用install方法都会返回值。
11984
// 如果调用install获取到数据并处理了自己的业务,后续不想再被触发,那么可以自己在业务调用成功时,设置一个标识,不再调用install方法
12085
void install(EventHandler installHandler, [int seconds = 10]) {
@@ -146,7 +111,7 @@ class OpeninstallFlutterPlugin {
146111
var args = new Map();
147112
args["pointId"] = pointId;
148113
args["pointValue"] = pointValue;
149-
if(extraMap != null){
114+
if (extraMap != null) {
150115
args["extras"] = extraMap;
151116
}
152117
_channel.invokeMethod('reportEffectPoint', args);

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: openinstall_flutter_plugin
22
description: openinstall_flutter_plugin is a Flutter plugin based on openinstall, and with null safety support.
3-
version: 2.4.5
3+
version: 2.5.0
44
homepage: https://www.openinstall.io
55

66
environment:

0 commit comments

Comments
 (0)