diff --git a/app.apk b/app.apk index 0f61a91..577c4ad 100644 Binary files a/app.apk and b/app.apk differ diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index 9d89d08..18108e2 100644 --- a/main/AndroidManifest.xml +++ b/main/AndroidManifest.xml @@ -2,17 +2,16 @@ + android:versionName="4.13"> + android:theme="@android:style/Theme.Holo.Light"> @@ -28,6 +27,8 @@ + + @@ -35,12 +36,16 @@ - + - + android:icon="@android:drawable/ic_menu_preferences" + android:parentActivityName=".MainActivity"/> diff --git a/main/assets/about.htm b/main/assets/about.htm index 10129f4..91e70cf 100644 --- a/main/assets/about.htm +++ b/main/assets/about.htm @@ -9,7 +9,7 @@ p { text-indent:2em; } -


海天鹰浏览器 V4.11

+


海天鹰浏览器 V4.13

内置扩展的浏览器。

扩展：链接关键字过滤，链接关键字高亮，图片自定义过滤，视频独立播放。

作者：海天鹰

@@ -23,6 +23,8 @@ p { text-indent:2em; }

获取网页图标

字符串转Bitmap

更新日志：

+

V4.13 (2020-08-30)

  1. 图片查看改为在新窗口中打开。
  2. 修复修改、删除收藏不能记忆位置问题。
+

V4.12 (2020-07-17)

  1. 适配全面屏导航栏背景色。
  2. 收藏夹无标题栏自定义菜单改成标题栏菜单。

V4.11 (2020-03-03)

  1. 收藏夹增加数目统计。
  2. 收藏夹增加菜单，导出HTML、CSV。

V4.10 (2019-12-17)

  1. 优化视频独立播放。

V4.9 (2019-11-06)

  1. 收藏夹网址增加分享功能。
diff --git a/main/java/com/hty/browser/FavoriteActivity.java b/main/java/com/hty/browser/FavoriteActivity.java index 2218d3a..7a20853 100644 --- a/main/java/com/hty/browser/FavoriteActivity.java +++ b/main/java/com/hty/browser/FavoriteActivity.java @@ -16,7 +16,9 @@ import android.text.TextWatcher; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; +import android.view.Menu; import android.view.MenuItem; +import android.view.MotionEvent; import android.view.View; import android.view.View.OnCreateContextMenuListener; import android.view.WindowManager; @@ -24,7 +26,6 @@ import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; -import android.widget.Button; import android.widget.EditText; import android.widget.ImageButton; import android.widget.ImageView; @@ -40,14 +41,12 @@ import java.io.FileWriter; import java.lang.reflect.Field; public class FavoriteActivity extends Activity { - SimpleCursorAdapter adapter; - ListView listView; EditText editText; - InputMethodManager IMM; ImageButton imageButton_clear; + InputMethodManager IMM; + ListView listView; + SimpleCursorAdapter adapter; int position = 0; - TextView textView_title; - Button button_favback; @Override protected void onCreate(Bundle savedInstanceState) { @@ -55,11 +54,8 @@ public class FavoriteActivity extends Activity { setContentView(R.layout.activity_favorite); getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); IMM = (InputMethodManager) getApplicationContext().getSystemService(Context.INPUT_METHOD_SERVICE); - button_favback = (Button) findViewById(R.id.button_favback); - button_favback.setText("<"); - textView_title = (TextView) findViewById(R.id.textView_title); imageButton_clear = (ImageButton) findViewById(R.id.imageButton_clear); - imageButton_clear.setOnClickListener(new ButtonListener()); + imageButton_clear.setOnClickListener(new OnClickListener()); imageButton_clear.setVisibility(View.GONE); editText = (EditText) findViewById(R.id.editText); editText.addTextChangedListener(new EditChangedListener()); @@ -87,23 +83,64 @@ public class FavoriteActivity extends Activity { menu.add(0, 3, 3, "分享"); } }); + listView.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View v, MotionEvent event) { + IMM.hideSoftInputFromWindow(editText.getWindowToken(), 0); + return false; + } + }); search(editText.getText().toString()); } - class ButtonListener implements View.OnClickListener { - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.imageButton_clear: - editText.setText(""); - break; - } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + String[] sm = { "导出HTML", "导出CSV" }; + for (int i=0; i\n收藏夹\n\n\n\n

收藏夹" + adapter.getCount() + "

\n\n\n"; + for (int i=0; i\n"; + } + s += "
标题网址
" + textView_title.getText().toString() + "" + textView_website.getText().toString() + "
\n\n"; + writeFile("webfav.htm", s); + break; + case 1: + s = ""; + for (int i=0; i\n收藏夹\n\n\n\n

收藏夹" + adapter.getCount() + "

\n\n\n"; - for (int i=0; i\n"; - } - s += "
标题网址
" + textView_title.getText().toString() + "" + textView_website.getText().toString() + "
\n\n"; - writeFile("webfav.htm", s); - break; - case 1: - s = ""; - for (int i=0; i= 19) { - webView.setWebContentsDebuggingEnabled(true); + webView.setWebContentsDebuggingEnabled(true); // 允许调试 } WebSettings webSettings = webView.getSettings(); - // 开启JS - webSettings.setJavaScriptEnabled(true); - // 开启JS能打开窗口 - webSettings.setJavaScriptCanOpenWindowsAutomatically(true); - // 开启缓存 - webSettings.setCacheMode(WebSettings.LOAD_DEFAULT); + webSettings.setJavaScriptEnabled(true); // 开启JS + webSettings.setJavaScriptCanOpenWindowsAutomatically(true);// 允许JS打开窗口 + webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);// 开启缓存 // 自适应屏幕 webSettings.setUseWideViewPort(true); webSettings.setLoadWithOverviewMode(true); - // 支持缩放 - webSettings.setSupportZoom(true); - // 启用内置缩放控件 - webSettings.setBuiltInZoomControls(true); - // 隐藏缩放控件 - webSettings.setDisplayZoomControls(false); - // 开启访问文件 - webSettings.setAllowFileAccess(true); - // 开启数据库 - webSettings.setDatabaseEnabled(true); - // 开启localStorage - webSettings.setDomStorageEnabled(true); - // 开启定位 - webSettings.setGeolocationEnabled(true); - // 支持多窗口 - webSettings.setSupportMultipleWindows(true); - // 允许跨域 - webSettings.setAllowUniversalAccessFromFileURLs(true); + webSettings.setSupportZoom(true); // 支持缩放 + webSettings.setBuiltInZoomControls(true);// 启用内置缩放控件 + webSettings.setDisplayZoomControls(false); // 隐藏缩放控件 + webSettings.setAllowFileAccess(true);// 开启文件访问 + webSettings.setDatabaseEnabled(true); // 开启数据库 + webSettings.setDomStorageEnabled(true); // 开启localStorage + webSettings.setGeolocationEnabled(true); // 开启定位 + webSettings.setSupportMultipleWindows(true); // 支持多窗口 + webSettings.setAllowUniversalAccessFromFileURLs(true); // 允许跨域 webView.setWebViewClient(new WebViewClient() { @Override diff --git a/main/java/com/hty/browser/SettingsActivity.java b/main/java/com/hty/browser/SettingsActivity.java index 6462743..f1f2c9d 100644 --- a/main/java/com/hty/browser/SettingsActivity.java +++ b/main/java/com/hty/browser/SettingsActivity.java @@ -26,20 +26,21 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref // 启动时显示 protected void onResume() { super.onResume(); - ETP_homepage.setSummary(SP.getString("homepage","http://www.baidu.com")); - ETP_filter.setSummary(SP.getString("filter","")); - ETP_highlight.setSummary(SP.getString("highlight","")); + ETP_homepage.setSummary(SP.getString("homepage", "http://www.baidu.com")); + ETP_filter.setSummary(SP.getString("filter", "")); + ETP_highlight.setSummary(SP.getString("highlight", "")); } @Override // 修改后显示 public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { if(key.equals("homepage")){ - ETP_homepage.setSummary(sharedPreferences.getString(key,"")); + ETP_homepage.setSummary(sharedPreferences.getString(key, "")); }else if(key.equals("filter")){ - ETP_filter.setSummary(sharedPreferences.getString(key,"")); + ETP_filter.setSummary(sharedPreferences.getString(key, "")); }else if(key.equals("highlight")){ - ETP_highlight.setSummary(sharedPreferences.getString(key,"")); + ETP_highlight.setSummary(sharedPreferences.getString(key, "")); } } -} + +} \ No newline at end of file diff --git a/main/res/layout/activity_favorite.xml b/main/res/layout/activity_favorite.xml index ca526bf..577a027 100644 --- a/main/res/layout/activity_favorite.xml +++ b/main/res/layout/activity_favorite.xml @@ -6,44 +6,6 @@ android:orientation="vertical" tools:context=".FavoriteActivity" > - - - - -