public/cordova-plugin-inappbrowser
public/cordova-plugin-inappbrowser
9
0
Fork 1
forked from github/cordova-plugin-inappbrowser
Code Pull Requests Activity

增加参数 canhardwareback ，物理返回键是否生效，默认生效

Browse Source
This commit is contained in:
976623696@qq.com 2020-09-29 15:11:12 +08:00
parent b956208c94
commit c9f18cb0e3
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/android/InAppBrowser.java
View File

@ -125,6 +125,7 @@ public class InAppBrowser extends CordovaPlugin {
private static final String COLOR = "color"; private static final String COLOR = "color";
private static final String BACKGROUND = "background"; private static final String BACKGROUND = "background";
private static final String BACKBUTTON = "backbutton"; private static final String BACKBUTTON = "backbutton";
private static final String CANHARDWAREBACK = "canhardwareback";
private static final List customizableOptions = Arrays.asList(CLOSE_BUTTON_CAPTION, TOOLBAR_COLOR, NAVIGATION_COLOR, CLOSE_BUTTON_COLOR, FOOTER_COLOR,BACKGROUND,COLOR); private static final List customizableOptions = Arrays.asList(CLOSE_BUTTON_CAPTION, TOOLBAR_COLOR, NAVIGATION_COLOR, CLOSE_BUTTON_COLOR, FOOTER_COLOR,BACKGROUND,COLOR);
@ -160,6 +161,8 @@ public class InAppBrowser extends CordovaPlugin {
private boolean statusbar = true; private boolean statusbar = true;
// 标题栏 // 标题栏
private boolean titlebar = false; private boolean titlebar = false;
// 物理返回键是否生效
private boolean canhardwareback = true;
private String color = ""; private String color = "";
private String background = ""; private String background = "";
private boolean backbutton = true; private boolean backbutton = true;
@ -757,6 +760,10 @@ public class InAppBrowser extends CordovaPlugin {
if (backbuttonSet != null) { if (backbuttonSet != null) {
backbutton = backbuttonSet.equals("yes"); backbutton = backbuttonSet.equals("yes");
} }
String canhardwarebackSet = features.get(CANHARDWAREBACK);
if (canhardwarebackSet != null) {
canhardwareback = canhardwarebackSet.equals("yes");
}
if (features.get(COLOR) != null) { if (features.get(COLOR) != null) {
color = features.get(COLOR); color = features.get(COLOR);
} }
@ -841,7 +848,7 @@ public class InAppBrowser extends CordovaPlugin {
}; };
// Let's create the main dialog // Let's create the main dialog
dialog = new InAppBrowserDialog(cordova.getActivity(),fullscreen ? android.R.style.Theme_NoTitleBar : android.R.style.Theme_Black); dialog = new InAppBrowserDialog(cordova.getActivity(),fullscreen ? android.R.style.Theme_NoTitleBar : android.R.style.Theme_Black, canhardwareback);
dialog.getWindow().getAttributes().windowAnimations = android.R.style.Animation_Dialog; dialog.getWindow().getAttributes().windowAnimations = android.R.style.Animation_Dialog;
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
if (fullscreen) { if (fullscreen) {

25
src/android/InAppBrowserDialog.java
View File

@ -31,10 +31,12 @@ import org.json.JSONObject;
public class InAppBrowserDialog extends Dialog { public class InAppBrowserDialog extends Dialog {
Context context; Context context;
InAppBrowser inAppBrowser = null; InAppBrowser inAppBrowser = null;
boolean canHardwareBack = true;
public InAppBrowserDialog(Context context, int theme) { public InAppBrowserDialog(Context context, int theme, boolean canHardwareBack) {
super(context, theme); super(context, theme);
this.context = context; this.context = context;
this.canHardwareBack = canHardwareBack;
} }
public void setInAppBroswer(InAppBrowser browser) { public void setInAppBroswer(InAppBrowser browser) {
@ -42,16 +44,19 @@ public class InAppBrowserDialog extends Dialog {
} }
public void onBackPressed () { public void onBackPressed () {
if (this.inAppBrowser == null) { if (canHardwareBack){
this.dismiss(); if (this.inAppBrowser == null) {
} else { this.dismiss();
// better to go through the in inAppBrowser } else {
// because it does a clean up // better to go through the in inAppBrowser
if (this.inAppBrowser.hardwareBack() && this.inAppBrowser.canGoBack()) { // because it does a clean up
this.inAppBrowser.goBack(); if (this.inAppBrowser.hardwareBack() && this.inAppBrowser.canGoBack()) {
} else { this.inAppBrowser.goBack();
this.inAppBrowser.closeDialog(); } else {
this.inAppBrowser.closeDialog();
}
} }
} }
} }
} }