取消淘宝跳转,收藏夹增加分享
This commit is contained in:
parent
263af96752
commit
63f3ce9e5c
|
@ -2,7 +2,7 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.hty.browser"
|
||||
android:versionCode="4"
|
||||
android:versionName="4.6">
|
||||
android:versionName="4.9">
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
|
|
|
@ -9,7 +9,7 @@ p { text-indent:2em; }
|
|||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<h2 align=center><img src=logo.png><br>海天鹰浏览器 V4.6</h2>
|
||||
<h2 align=center><img src=logo.png><br>海天鹰浏览器 V4.9</h2>
|
||||
<p>内置扩展的浏览器。</p>
|
||||
<p>扩展:链接关键字过滤,链接关键字高亮,图片自定义过滤,视频独立播放。</p>
|
||||
<p>作者:黄颖</p>
|
||||
|
@ -23,6 +23,9 @@ p { text-indent:2em; }
|
|||
<p><a href="https://stackoverflow.com/questions/3462582/display-the-android-webviews-favicon" target="_blank">获取网页图标</a></p>
|
||||
<p><a href="https://www.jianshu.com/p/c9a18050a249" target="_blank">字符串转Bitmap</a></p>
|
||||
<h3>更新日志:</h3>
|
||||
<h3>V4.9 (2019-11-06)</h3><ol><li>收藏夹网址增加分享功能。</li></ol>
|
||||
<h3>V4.8 (2019-10-25)</h3><ol><li>协议过滤:去除淘宝跳转,增加ftp。</li><li>修复:退出前未反注册广播。</li></ol>
|
||||
<h3>V4.7 (2019-08-14)</h3><ol><li>增加:清除缓存菜单。</li><li>target="_blank"是用户触发才在新窗口中打开。</li></ol>
|
||||
<h3>V4.6 (2019-07-16)</h3><ol><li>修复:移动数据连接不能下载。</li></ol>
|
||||
<h3>V4.5 (2019-06-19)</h3><ol><li>增加:视频截图。</li><li>简化:视频独立播放。</li></ol>
|
||||
<h3>V4.4 (2019-05-02)</h3><ol><li>增加扩展和设置开关:图片宽度超过父容器宽度,图片缩小到父容器宽度。</li></ol>
|
||||
|
|
|
@ -75,6 +75,7 @@ public class FavoriteActivity extends Activity {
|
|||
menu.add(0, 0, 0, "复制链接");
|
||||
menu.add(0, 1, 1, "删除");
|
||||
menu.add(0, 2, 2, "修改");
|
||||
menu.add(0, 3, 3, "分享");
|
||||
}
|
||||
});
|
||||
search(editText.getText().toString());
|
||||
|
@ -190,6 +191,13 @@ public class FavoriteActivity extends Activity {
|
|||
});
|
||||
builder.create().show();
|
||||
break;
|
||||
case 3:
|
||||
Intent intent = new Intent();
|
||||
intent.setAction(Intent.ACTION_SEND);
|
||||
intent.putExtra(Intent.EXTRA_TEXT, ((TextView) menuInfo.targetView.findViewById(R.id.title)).getText().toString() + "\n" + ((TextView) menuInfo.targetView.findViewById(R.id.website)).getText().toString());
|
||||
intent.setType("text/plain");
|
||||
startActivity(Intent.createChooser(intent, "分享"));
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -121,6 +121,7 @@ public class MainActivity extends Activity {
|
|||
List<WebView> list_webView = new ArrayList<>();
|
||||
int currentPage;
|
||||
int FILECHOOSER_DOWNLOAD_PATH = 3;
|
||||
DownloadCompleteReceiver receiver;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
@ -241,7 +242,7 @@ public class MainActivity extends Activity {
|
|||
};
|
||||
new Thread(CU).start();
|
||||
|
||||
DownloadCompleteReceiver receiver = new DownloadCompleteReceiver();
|
||||
receiver = new DownloadCompleteReceiver();
|
||||
IntentFilter intentFilter = new IntentFilter();
|
||||
intentFilter.addAction(DownloadManager.ACTION_DOWNLOAD_COMPLETE);
|
||||
registerReceiver(receiver, intentFilter);
|
||||
|
@ -634,7 +635,7 @@ public class MainActivity extends Activity {
|
|||
}
|
||||
|
||||
void MenuDialog() {
|
||||
String[] items = { "新建窗口", "关闭当前窗口", "收藏当前页", "收藏夹", "查找", "分享", "视频独立播放", "视频截图", "视频在播放器中打开", "查看源码", "主页", "全屏", "广告过滤规则", "设置", "检查更新", "关于", "退出" };
|
||||
String[] items = { "新建窗口", "关闭当前窗口", "收藏当前页", "收藏夹", "查找", "分享", "视频独立播放", "视频截图", "视频在播放器中打开", "查看源码", "主页", "全屏", "广告过滤规则", "设置", "检查更新", "关于", "退出", "清除缓存" };
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
builder.setTitle("菜单");
|
||||
builder.setIcon(R.drawable.ic_launcher);
|
||||
|
@ -885,8 +886,12 @@ public class MainActivity extends Activity {
|
|||
list_webView.get(currentPage).loadUrl("file:///android_asset/about.htm");
|
||||
break;
|
||||
case 16:
|
||||
unregisterReceiver(receiver);
|
||||
MainActivity.this.finish();
|
||||
break;
|
||||
case 17:
|
||||
list_webView.get(currentPage).clearCache(true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@ -1190,7 +1195,7 @@ public class MainActivity extends Activity {
|
|||
button_page.setText(currentPage + 1 + "");
|
||||
}
|
||||
|
||||
void settingWebView(final WebView webView){
|
||||
void settingWebView(WebView webView){
|
||||
// 菜单
|
||||
registerForContextMenu(webView);
|
||||
// 支持获取手势焦点
|
||||
|
@ -1233,12 +1238,9 @@ public class MainActivity extends Activity {
|
|||
public boolean shouldOverrideUrlLoading(WebView view, String url) {
|
||||
Log.e(Thread.currentThread().getStackTrace()[2] + "", url);
|
||||
// 协议过滤
|
||||
if (url.startsWith("http") && !url.startsWith("https://cdn-haokanapk.baidu.com/")) {
|
||||
if (url.startsWith("http") || url.startsWith("ftp://") && !url.startsWith("https://cdn-haokanapk.baidu.com/")) {
|
||||
view.loadUrl(url);
|
||||
return false;
|
||||
} else if (url.startsWith("tbopen://")){
|
||||
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
|
||||
startActivity(intent);
|
||||
}
|
||||
return true; // 拦截原链接
|
||||
}
|
||||
|
@ -1277,16 +1279,16 @@ public class MainActivity extends Activity {
|
|||
Log.e(Thread.currentThread().getStackTrace()[2] + "", failingUrl);
|
||||
String url = "http://m.baidu.com/s?word=" + urlo;
|
||||
editText1.setText(url);
|
||||
webView.loadUrl(url);
|
||||
view.loadUrl(url);
|
||||
urln = url;
|
||||
break;
|
||||
case WebViewClient.ERROR_UNSUPPORTED_SCHEME:
|
||||
Log.e(Thread.currentThread().getStackTrace()[2] + "",failingUrl);
|
||||
}
|
||||
} else {
|
||||
webView.loadDataWithBaseURL(
|
||||
view.loadDataWithBaseURL(
|
||||
"",
|
||||
"<html><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no\"/><style>h1{font-size:10vw;margin:40vh auto;text-align:center;}</style><h1>网络未连接</h1></html>",
|
||||
"<html><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no\"/><title>网络未连接</title><style>h1{font-size:10vw;margin:40vh auto;text-align:center;}</style><body><h1>网络未连接</h1></body></html>",
|
||||
"text/html", "utf-8", "");
|
||||
}
|
||||
}
|
||||
|
@ -1309,9 +1311,9 @@ public class MainActivity extends Activity {
|
|||
webView.setOnTouchListener(new OnTouchListener() {
|
||||
@Override
|
||||
public boolean onTouch(View v, MotionEvent event) {
|
||||
button_title.requestFocus();
|
||||
button_title.setVisibility(View.VISIBLE);
|
||||
editText1.setVisibility(View.GONE);
|
||||
webView.requestFocus();
|
||||
IMM.hideSoftInputFromWindow(editText1.getWindowToken(), 0);
|
||||
return false;
|
||||
}
|
||||
|
@ -1430,6 +1432,7 @@ public class MainActivity extends Activity {
|
|||
// target="_blank" 处理
|
||||
@Override
|
||||
public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGesture, Message resultMsg) {
|
||||
if(isUserGesture) {
|
||||
WebView webView = new WebView(MainActivity.this);
|
||||
settingWebView(webView);
|
||||
webViewLayout.removeAllViews();
|
||||
|
@ -1440,6 +1443,7 @@ public class MainActivity extends Activity {
|
|||
WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
|
||||
transport.setWebView(webView);
|
||||
resultMsg.sendToTarget();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue