diff --git a/app-debug.apk b/app-debug.apk index 119270f..dfbc766 100644 Binary files a/app-debug.apk and b/app-debug.apk differ diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index c7252d3..fb1f3a2 100644 --- a/main/AndroidManifest.xml +++ b/main/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="3.7"> 海天鹰浏览器 -


海天鹰浏览器 V3.6

+


海天鹰浏览器 V3.7

内置扩展的浏览器。

扩展：[国产]高亮，广告图片自定义过滤。

作者：黄颖

+

主页：https://github.com/sonichy

E-mail：sonichy@163.com

QQ：84429027

+

参考：

+

Android WebView 三种文件下载方式

+

自动安装apk包

更新日志：

+

V3.7 (2018-06-13)

  1. 增加自动更新。

V3.6 (2018-05-30)

  1. 修复从收藏夹返回输入法不能自动隐藏的问题。

V3.5 (2018-04-25)

  1. 收藏夹支持搜索。

V3.4 (2018-03-13)

  1. 增加视频独立播放。
  2. 使用系统下载取代浏览器跳转下载、图片下载，并增加链接下载
diff --git a/main/java/com/hty/browser/MainActivity.java b/main/java/com/hty/browser/MainActivity.java index 793c636..5e22639 100644 --- a/main/java/com/hty/browser/MainActivity.java +++ b/main/java/com/hty/browser/MainActivity.java @@ -1,5 +1,6 @@ package com.hty.browser; +import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; @@ -7,6 +8,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; @@ -16,6 +18,7 @@ import java.util.List; import android.app.Activity; import android.app.AlertDialog; import android.app.DownloadManager; +import android.content.BroadcastReceiver; import android.content.ClipData; import android.content.ClipboardManager; import android.content.ContentResolver; @@ -23,8 +26,10 @@ import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.pm.ActivityInfo; +import android.content.pm.PackageManager; import android.content.res.Configuration; import android.database.Cursor; import android.graphics.Bitmap; @@ -35,6 +40,7 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; +import android.os.Looper; import android.preference.PreferenceManager; import android.provider.MediaStore; import android.text.Editable; @@ -85,11 +91,14 @@ public class MainActivity extends Activity { InputMethodManager IMM; ProgressBar pgb1; String urlo = "", HTRE = "", ptitle = "", urln = ""; - int ec = 0; + String urlVersion = "https://raw.githubusercontent.com/sonichy/Android_HTYBrowser/master/version"; + String urlUpdate = "https://raw.githubusercontent.com/sonichy/Android_HTYBrowser/master/app-debug.apk"; CustomViewCallback customViewCallback; - boolean isFullScreen; + boolean isFullScreen, isManualCheckUpdate = false; static File dir; SharedPreferences sharedPreferences; + Thread CU; + long downloadIdUpdate; @Override protected void onCreate(Bundle savedInstanceState) { @@ -208,8 +217,7 @@ public class MainActivity extends Activity { @Override public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) { super.onReceivedError(view, errorCode, description, failingUrl); - Toast.makeText(getApplicationContext(), "ReceivedError:" + errorCode, Toast.LENGTH_SHORT) - .show(); + Toast.makeText(getApplicationContext(), "ReceivedError:" + errorCode, Toast.LENGTH_SHORT).show(); if (isNetworkConnected()) { switch(errorCode){ case WebViewClient.ERROR_HOST_LOOKUP: // 找不到主机，跳转百度搜索 @@ -409,6 +417,18 @@ public class MainActivity extends Activity { }); + CU = new Thread() { + @Override + public void run() { + checkUpdate(); + } + }; + new Thread(CU).start(); + + DownloadCompleteReceiver receiver = new DownloadCompleteReceiver(); + IntentFilter intentFilter = new IntentFilter(); + intentFilter.addAction(DownloadManager.ACTION_DOWNLOAD_COMPLETE); + registerReceiver(receiver, intentFilter); } private void setFullScreen() { @@ -747,7 +767,7 @@ public class MainActivity extends Activity { } void MenuDialog() { - final String items[] = { "收藏本页", "收藏夹", "查找", "分享", "视频独立播放", "查看源码", "主页", "全屏", "广告过滤规则", "设置", "关于", "退出" }; + String[] items = { "收藏本页", "收藏夹", "查找", "分享", "视频独立播放", "查看源码", "主页", "全屏", "广告过滤规则", "设置", "检查更新", "关于", "退出" }; AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle("菜单"); builder.setIcon(R.drawable.ic_launcher); @@ -810,9 +830,13 @@ public class MainActivity extends Activity { startActivity(new Intent(MainActivity.this, SettingsActivity.class)); break; case 10: + isManualCheckUpdate = true; + new Thread(CU).start(); + break; + case 11: webView1.loadUrl("file:///android_asset/about.htm"); break; - case 11: + case 12: MainActivity.this.finish(); break; } @@ -1022,10 +1046,85 @@ public class MainActivity extends Activity { // 自定义下载路径 // request.setDestinationUri() // request.setDestinationInExternalFilesDir() - final DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE); + DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE); // 添加一个下载任务 long downloadId = downloadManager.enqueue(request); - Log.e("downloadId:", downloadId+""); + Log.e("downloadId:", downloadId+""); + if(url == urlUpdate){ + downloadIdUpdate = downloadId; + } } + void checkUpdate() { + try { + String versionL = MainActivity.this.getPackageManager().getPackageInfo(MainActivity.this.getPackageName(), 0).versionName; + URL url = new URL(urlVersion); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + //conn.setRequestMethod("GET"); + //if (conn.getResponseCode() == 200) { + InputStream IS = conn.getInputStream(); + InputStreamReader ISR = new InputStreamReader(IS); + BufferedReader bufferReader = new BufferedReader(ISR); + String versionS = bufferReader.readLine(); + Log.e("Version", versionS + " > " + versionL + " ?"); + String[] AVersionS = versionS.split("\\."); + String[] AVersionL = versionL.split("\\."); + //Log.e("Version: ", AVersionS[0] + " > " + AVersionL[0] + " ? " + AVersionS[1] + " > " + AVersionL[1] + " ?"); + if ((Integer.parseInt(AVersionS[0]) > Integer.parseInt(AVersionL[0])) || (Integer.parseInt(AVersionS[1]) > Integer.parseInt(AVersionL[1]))) { + Looper.prepare(); + AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this); + builder.setIcon(R.drawable.ic_launcher); + builder.setTitle("升级"); + builder.setMessage("发现新版本 " + versionS + " ，当前版本 " + versionL + " ，是否升级？"); + builder.setPositiveButton("确定", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + downloadBySystem(urlUpdate, "", ""); + } + }); + builder.setNegativeButton("取消", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }); + AlertDialog dialog = builder.create(); + dialog.show(); + Looper.myLooper().loop(); + } else { + if(isManualCheckUpdate) { + Looper.prepare(); + Toast.makeText(getApplicationContext(), "当前版本 " + versionL + " 是最新的版本", Toast.LENGTH_SHORT).show(); + Looper.myLooper().loop(); + } + Log.e("检查更新: ", "当前版本是最新的版本"); + } + //} + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + private class DownloadCompleteReceiver extends BroadcastReceiver { + @Override + public void onReceive(Context context, Intent intent) { + Log.e("onReceive.intent", intent != null ? intent.toUri(0) : null); + if (intent != null) { + if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction())) { + long downloadId = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1); + Log.e("DownloadId", downloadId + ""); + DownloadManager downloadManager = (DownloadManager) context.getSystemService(DOWNLOAD_SERVICE); + if(downloadId ==downloadIdUpdate){ + Uri uri = downloadManager.getUriForDownloadedFile(downloadId); + Log.e("UriDownload", uri.toString()); + Intent intentn = new Intent(Intent.ACTION_VIEW); + intentn.setDataAndType(uri, "application/vnd.android.package-archive"); + startActivity(intentn); + } + } + } + } + } + } \ No newline at end of file