diff --git a/app.apk b/app.apk index b4886af..06aadd1 100644 Binary files a/app.apk and b/app.apk differ diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index 1819ec4..8c7a644 100644 --- a/main/AndroidManifest.xml +++ b/main/AndroidManifest.xml @@ -2,7 +2,7 @@ + android:versionName="4.37"> diff --git a/main/assets/about.htm b/main/assets/about.htm index eb71a46..8868ab8 100644 --- a/main/assets/about.htm +++ b/main/assets/about.htm @@ -9,7 +9,7 @@ p { text-indent:2em; } -


海天鹰浏览器 V4.36

+


海天鹰浏览器 V4.37

内置扩展的浏览器。

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

作者：海天鹰

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

获取网页图标

字符串转Bitmap

更新日志：

+

V4.37 (2024-03-27)

  1. 修复保存网址规则前面有1个空格的问题。
  2. 增加点击规则查看详情。

V4.36 (2024-03-25)

  1. 增加添加网址到主页。

V4.35 (2024-03-16)

  1. 增加自定义主页。

V4.34 (2024-01-30)

  1. 增加hash链接转magnet。
diff --git a/main/java/com/hty/browser/ADBlockActivity.java b/main/java/com/hty/browser/ADBlockActivity.java index 9a04b19..2a08c18 100644 --- a/main/java/com/hty/browser/ADBlockActivity.java +++ b/main/java/com/hty/browser/ADBlockActivity.java @@ -4,14 +4,9 @@ import android.app.Activity; import android.app.AlertDialog; import android.content.ClipData; import android.content.ClipboardManager; -import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.graphics.Color; -import android.media.MediaScannerConnection; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; @@ -26,19 +21,13 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.EditText; import android.widget.ImageButton; -import android.widget.LinearLayout; import android.widget.ListView; -import android.widget.RadioButton; -import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; -import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; -import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.FileWriter; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; @@ -50,7 +39,6 @@ public class ADBlockActivity extends Activity { ListView listView; ArrayAdapter adapter; List datas0, datas; - //String[] SL; InputMethodManager IMM; int position; @@ -98,6 +86,29 @@ public class ADBlockActivity extends Activity { adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, datas); listView = (ListView) findViewById(R.id.listView); listView.setAdapter(adapter); + + listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView arg0, View arg1, int arg2, long arg3) { + String url = ((TextView) arg1.findViewById(android.R.id.text1)).getText().toString(); + AlertDialog.Builder builder = new AlertDialog.Builder(ADBlockActivity.this); + builder.setIcon(android.R.drawable.ic_menu_info_details); + builder.setTitle("规则"); + builder.setMessage(url); + builder.setPositiveButton("打开", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + Intent intent = new Intent(ADBlockActivity.this, MainActivity.class); + intent.putExtra("url", url); + intent.putExtra("newWindow", true); + setResult(RESULT_OK, intent); + } + }); + builder.setNegativeButton("取消", null); + builder.create().show(); + } + }); + listView.setOnCreateContextMenuListener(new View.OnCreateContextMenuListener() { @Override public void onCreateContextMenu(ContextMenu menu, View view, ContextMenu.ContextMenuInfo menuInfo) { @@ -132,12 +143,12 @@ public class ADBlockActivity extends Activity { int id = item.getItemId(); switch (id) { case 0: - //SL = readFile("blockrules").split(","); datas0 = Arrays.asList(readFile("blockrules").split(",")); search(); break; case 1: - String s = datas.toString().replace("[", "").replace("]", ""); + IMM.hideSoftInputFromWindow(editText.getWindowToken(), 0); + String s = datas.toString().replace("[", "").replace("]", "").replace(", ", ","); Log.e(Thread.currentThread().getStackTrace()[2] + "", "Write: " + s); writeFile("blockrules", s); break; @@ -179,11 +190,11 @@ public class ADBlockActivity extends Activity { break; case 3: final EditText editText_url = new EditText(ADBlockActivity.this); - editText_url.setMaxLines(3); + editText_url.setMaxLines(4); editText_url.setHint("网址"); editText_url.setText(url); AlertDialog.Builder builder = new AlertDialog.Builder(ADBlockActivity.this); - builder.setIcon(android.R.drawable.btn_star_big_on); + builder.setIcon(android.R.drawable.ic_menu_edit); builder.setTitle("修改"); builder.setView(editText_url); builder.setPositiveButton("确定", new DialogInterface.OnClickListener() { @@ -241,6 +252,7 @@ public class ADBlockActivity extends Activity { } void search() { + IMM.hideSoftInputFromWindow(editText.getWindowToken(), 0); datas.clear(); String s = editText.getText().toString(); for (int i=0; i