Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix switchWifiSilence and switchBluetoothSilence callback functions #131

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions SystemSetting.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,12 @@ export default class SystemSetting {
return (result) > 0
}

static switchWifiSilence(complete) {
static async switchWifiSilence(complete) {
if (Utils.isAndroid) {
SystemSetting.listenEvent(complete)
let listener = await SystemSetting.addWifiListener(() => {
SystemSetting.removeListener(listener);
complete();
});
SystemSettingNative.switchWifiSilence()
} else {
SystemSetting.switchWifi(complete)
Expand Down Expand Up @@ -181,9 +184,12 @@ export default class SystemSetting {
SystemSettingNative.switchBluetooth()
}

static switchBluetoothSilence(complete) {
static async switchBluetoothSilence(complete) {
if (Utils.isAndroid) {
SystemSetting.listenEvent(complete)
let listener = await SystemSetting.addBluetoothListener(() => {
SystemSetting.removeListener(listener);
complete();
})
SystemSettingNative.switchBluetoothSilence()
} else {
SystemSettingNative.switchBluetooth(complete)
Expand Down Expand Up @@ -268,4 +274,4 @@ export default class SystemSetting {
complete()
})
}
}
}
11 changes: 11 additions & 0 deletions android/src/main/java/com/ninty/system/setting/SystemSetting.java
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ public void run() {
public void getAppBrightness(Promise promise) {
final Activity curActivity = getCurrentActivity();
if (curActivity == null) {
promise.reject("-1", "cannot get app brightness: current activity is null");
return;
}
try {
Expand Down Expand Up @@ -597,4 +598,14 @@ public void onReceive(Context context, Intent intent) {
}
}
}

@ReactMethod
public void addListener(String eventName) {
// Keep: Required for RN built in Event Emitter Calls.
}

@ReactMethod
public void removeListeners(Integer count) {
// Keep: Required for RN built in Event Emitter Calls.
}
}
8 changes: 8 additions & 0 deletions ios/RTCSystemSetting.m
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,14 @@ +(BOOL)requiresMainQueueSetup{
}
}

RCT_EXPORT_METHOD(addListener : (NSString *)eventName) {
// Keep: Required for RN built in Event Emitter Calls.
}

RCT_EXPORT_METHOD(removeListeners : (NSInteger)count) {
// Keep: Required for RN built in Event Emitter Calls.
}

-(void)showVolumeUI:(BOOL)flag{
if(flag && [volumeView superview]){
[volumeView removeFromSuperview];
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-system-setting",
"version": "1.7.6",
"version": "1.7.7",
"description": "provide some system setting APIs. Volume, brightness, wifi, location, bluetooth, airplane...",
"main": "SystemSetting.js",
"types": "SystemSetting.d.ts",
Expand Down