diff --git a/app.apk b/app.apk index 04b7e09..b100aea 100644 Binary files a/app.apk and b/app.apk differ diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index 607bcc4..e3acb6d 100644 --- a/main/AndroidManifest.xml +++ b/main/AndroidManifest.xml @@ -31,15 +31,12 @@ android:theme="@android:style/Theme.Holo.Light.NoActionBar"> - - - diff --git a/main/java/com/hty/browser/FavoriteActivity.java b/main/java/com/hty/browser/FavoriteActivity.java index 526ef2f..aee42ae 100644 --- a/main/java/com/hty/browser/FavoriteActivity.java +++ b/main/java/com/hty/browser/FavoriteActivity.java @@ -10,6 +10,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; +import android.graphics.Color; import android.net.Uri; import android.os.Bundle; import android.text.Editable; @@ -293,6 +294,7 @@ public class FavoriteActivity extends Activity { editText_url.setText(url); layout.addView(editText_url); final Spinner spinner = new Spinner(this); + spinner.setBackgroundColor(Color.GRAY); ArrayList list = new ArrayList<>(); DBHelper helper = new DBHelper(this); Cursor cursor = helper.category(); diff --git a/main/java/com/hty/browser/FavoriteActivity1.java b/main/java/com/hty/browser/FavoriteActivity1.java index beaa2ea..6f935d1 100644 --- a/main/java/com/hty/browser/FavoriteActivity1.java +++ b/main/java/com/hty/browser/FavoriteActivity1.java @@ -10,6 +10,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; +import android.graphics.Color; import android.net.Uri; import android.os.Bundle; import android.text.Editable; @@ -19,6 +20,9 @@ import android.view.ContextMenu; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.ViewGroup; +import android.view.WindowManager; +import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.EditText; import android.widget.ExpandableListView; @@ -48,6 +52,7 @@ public class FavoriteActivity1 extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_favorite1); + getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); editText = (EditText) findViewById(R.id.editText1); editText.addTextChangedListener(new EditChangedListener()); imageButton_clear = (ImageButton) findViewById(R.id.imageButton_clear1); @@ -320,6 +325,7 @@ public class FavoriteActivity1 extends Activity { editText_url.setText(url); layout.addView(editText_url); final Spinner spinner = new Spinner(this); + spinner.setBackgroundColor(Color.GRAY); ArrayList list = new ArrayList<>(); DBHelper helper = new DBHelper(this); Cursor cursor = helper.category(); diff --git a/main/java/com/hty/browser/MainActivity.java b/main/java/com/hty/browser/MainActivity.java index 687a33a..f452d3b 100644 --- a/main/java/com/hty/browser/MainActivity.java +++ b/main/java/com/hty/browser/MainActivity.java @@ -43,6 +43,7 @@ import android.content.res.Configuration; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.Color; import android.graphics.Matrix; import android.graphics.drawable.BitmapDrawable; import android.media.MediaScannerConnection; @@ -715,6 +716,7 @@ public class MainActivity extends Activity { editText_url.setText(list_webView.get(currentPage).getUrl()); layout.addView(editText_url); final Spinner spinner = new Spinner(MainActivity.this); + spinner.setBackgroundColor(Color.GRAY); ArrayList list = new ArrayList<>(); DBHelper helper = new DBHelper(MainActivity.this); Cursor cursor = helper.category(); @@ -1186,14 +1188,14 @@ public class MainActivity extends Activity { InputStreamReader ISR = new InputStreamReader(IS); BufferedReader BR = new BufferedReader(ISR); String versionS = BR.readLine(); - if (!versionS.startsWith("{") && !versionS.endsWith("}")) { + if (versionS.startsWith("{") && versionS.endsWith("}")) { + versionS = versionS.replace("{", ""); + versionS = versionS.replace("}", ""); + } else { Looper.prepare(); Toast.makeText(getApplicationContext(), "服务器版本号解析错误:\n" + versionS, Toast.LENGTH_SHORT).show(); Looper.myLooper().loop(); return; - } else { - versionS = versionS.replace("{", ""); - versionS = versionS.replace("}", ""); } Log.e(Thread.currentThread().getStackTrace()[2] + "", versionS + " > " + versionL + " ?"); String[] AVersionS = versionS.split("\\.");