From 205a7bba1dbef65c082daa17df82ab8339a5411d Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 05 二月 2021 21:55:24 +0800
Subject: [PATCH] Merge branch '3.7.9' of ssh://193.112.35.168:29418/buwan-android-new into 3.7.9
---
BuWanVideo/src/com/weikou/beibeivideo/ui/mine/BrowserActivity.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/BuWanVideo/src/com/weikou/beibeivideo/ui/mine/BrowserActivity.java b/BuWanVideo/src/com/weikou/beibeivideo/ui/mine/BrowserActivity.java
index 2402e89..cd08de1 100644
--- a/BuWanVideo/src/com/weikou/beibeivideo/ui/mine/BrowserActivity.java
+++ b/BuWanVideo/src/com/weikou/beibeivideo/ui/mine/BrowserActivity.java
@@ -1,5 +1,6 @@
package com.weikou.beibeivideo.ui.mine;
+import android.app.Activity;
import android.app.AlertDialog;
import android.app.Notification;
import android.app.NotificationChannel;
@@ -153,6 +154,8 @@
webview.addJavascriptInterface(new BWJavaInterface(this, webview), "yestv");
}
+ private boolean needSetResult = false;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -192,6 +195,7 @@
String url = getIntent().getStringExtra("url");
// String url="http://192.168.3.122:8848/buwan-web/BuWanWeb/vip/index.html";
webview.loadUrl(url);
+ needSetResult = getIntent().getBooleanExtra("result", false);
}
// 鏂囦欢涓嬭浇鐩戝惉
@@ -303,7 +307,7 @@
super.onResume();
MobclickAgent.onPageStart("缃戦〉");
// webview.reload();
- if(webview!=null){
+ if (webview != null) {
webview.loadUrl("javascript:onResume()");
}
}
@@ -332,19 +336,25 @@
switch (v.getId()) {
case R.id.tv_top_bar_left: {
if (!webview.canGoBack())
- finish();
+ finishPage();
else {
webview.goBack();
}
}
break;
case R.id.tv_top_bar_left2: {
- finish();
+ finishPage();
}
break;
default:
break;
}
+ }
+
+ private void finishPage() {
+ if (needSetResult)
+ setResult(Activity.RESULT_OK);
+ finish();
}
// 璁剧疆鍥為��
@@ -354,6 +364,10 @@
if ((keyCode == KeyEvent.KEYCODE_BACK) && webview.canGoBack()) {
webview.goBack(); // goBack()琛ㄧず杩斿洖WebView鐨勪笂涓�椤甸潰
return true;
+ } else {
+ if (keyCode == KeyEvent.KEYCODE_BACK) {
+ finishPage();
+ }
}
return super.onKeyDown(keyCode, event);
}
--
Gitblit v1.8.0