diff --git a/.cproject b/.cproject index 46ab49d27..a3b78579c 100644 --- a/.cproject +++ b/.cproject @@ -20,7 +20,7 @@ - + diff --git a/.project b/.project index ec9200712..5e84fc879 100644 --- a/.project +++ b/.project @@ -7,7 +7,7 @@ org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, + full,incremental, diff --git a/res/drawable-hdpi/ic_setting_advanced.png b/res/drawable-hdpi/ic_setting_advanced.png new file mode 100644 index 000000000..58715cb12 Binary files /dev/null and b/res/drawable-hdpi/ic_setting_advanced.png differ diff --git a/res/drawable-hdpi/ic_setting_advanced_dark.png b/res/drawable-hdpi/ic_setting_advanced_dark.png new file mode 100644 index 000000000..0e5a4bc47 Binary files /dev/null and b/res/drawable-hdpi/ic_setting_advanced_dark.png differ diff --git a/res/drawable-mdpi/ic_setting_advanced.png b/res/drawable-mdpi/ic_setting_advanced.png new file mode 100644 index 000000000..728820ce1 Binary files /dev/null and b/res/drawable-mdpi/ic_setting_advanced.png differ diff --git a/res/drawable-mdpi/ic_setting_advanced_dark.png b/res/drawable-mdpi/ic_setting_advanced_dark.png new file mode 100644 index 000000000..43b1eb354 Binary files /dev/null and b/res/drawable-mdpi/ic_setting_advanced_dark.png differ diff --git a/res/drawable-xhdpi/ic_setting_advanced.png b/res/drawable-xhdpi/ic_setting_advanced.png new file mode 100644 index 000000000..316f3a5d0 Binary files /dev/null and b/res/drawable-xhdpi/ic_setting_advanced.png differ diff --git a/res/drawable-xhdpi/ic_setting_advanced_dark.png b/res/drawable-xhdpi/ic_setting_advanced_dark.png new file mode 100644 index 000000000..02e8701a9 Binary files /dev/null and b/res/drawable-xhdpi/ic_setting_advanced_dark.png differ diff --git a/res/drawable-xxhdpi/ic_setting_advanced.png b/res/drawable-xxhdpi/ic_setting_advanced.png new file mode 100644 index 000000000..3e1a3ede0 Binary files /dev/null and b/res/drawable-xxhdpi/ic_setting_advanced.png differ diff --git a/res/drawable-xxhdpi/ic_setting_advanced_dark.png b/res/drawable-xxhdpi/ic_setting_advanced_dark.png new file mode 100644 index 000000000..673c54ac8 Binary files /dev/null and b/res/drawable-xxhdpi/ic_setting_advanced_dark.png differ diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 1b8499249..a00efba25 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -205,6 +205,9 @@ 显示时间 显示电量 + 高级 + HTTP + 关于 作者 日志 diff --git a/res/xml/advanced_settings.xml b/res/xml/advanced_settings.xml new file mode 100644 index 000000000..a8e219fa1 --- /dev/null +++ b/res/xml/advanced_settings.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index 30c6e7f43..6b01ad436 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -40,6 +40,12 @@ android:title="@string/read_settings_title" android:icon="@drawable/ic_setting_read_dark" /> +
+
mQueryMap = new HashMap(); + + public UrlBuilder(String rootUrl) { + mRootUrl = rootUrl; + } + + public void addQuery(String key, Object value) { + mQueryMap.put(key, value); + } + + public String build() { + if (mQueryMap.size() == 0) { + return mRootUrl; + } else { + StringBuilder sb = new StringBuilder(mRootUrl); + sb.append("?"); + + Iterator iter = mQueryMap.keySet().iterator(); + if (iter.hasNext()) { + String key = iter.next(); + Object value = mQueryMap.get(key); + sb.append(key).append("=").append(value); + } + while (iter.hasNext()) { + String key = iter.next(); + Object value = mQueryMap.get(key); + sb.append("&").append(key).append("=").append(value); + } + return sb.toString(); + } + } +} diff --git a/src/com/hippo/ehviewer/ui/SettingsActivity.java b/src/com/hippo/ehviewer/ui/SettingsActivity.java index 668a986e6..857bfbd85 100644 --- a/src/com/hippo/ehviewer/ui/SettingsActivity.java +++ b/src/com/hippo/ehviewer/ui/SettingsActivity.java @@ -137,6 +137,7 @@ public class SettingsActivity extends AbsPreferenceActivity { EhFragment.class.getName(), DataFragment.class.getName(), ReadFragment.class.getName(), + AdvancedFragment.class.getName(), AboutFragment.class.getName() }; @@ -145,6 +146,7 @@ public class SettingsActivity extends AbsPreferenceActivity { R.drawable.ic_action_panda, R.drawable.ic_setting_data, R.drawable.ic_setting_read, + R.drawable.ic_setting_advanced, R.drawable.ic_setting_about }; @@ -609,6 +611,14 @@ public class SettingsActivity extends AbsPreferenceActivity { } } + public static class AdvancedFragment extends TranslucentPreferenceFragment { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.advanced_settings); + } + } + public static class AboutFragment extends TranslucentPreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener { diff --git a/src/com/hippo/ehviewer/util/Log.java b/src/com/hippo/ehviewer/util/Log.java index 162dfc4ce..6069ecb53 100644 --- a/src/com/hippo/ehviewer/util/Log.java +++ b/src/com/hippo/ehviewer/util/Log.java @@ -22,7 +22,9 @@ import java.io.IOException; import android.content.Context; -public class Log { +import com.hippo.ehviewer.AppContext; + +public final class Log { private static final String NULL = "null"; private static final String LOG_FILENAME = "log.log"; @@ -72,51 +74,59 @@ public class Log { } public static int v(String tag, String msg) { - if (msg == null) - msg = NULL; - return android.util.Log.v(tag, msg); + if (AppContext.DEBUG) + return android.util.Log.v(tag, msg == null ? NULL : msg); + else + return 0; } public static int v(String tag, String msg, Throwable tr) { - if (msg == null) - msg = NULL; - return android.util.Log.v(tag, msg, tr); + if (AppContext.DEBUG) + return android.util.Log.v(tag, msg == null ? NULL : msg, tr); + else + return 0; } public static int d(String tag, String msg) { - if (msg == null) - msg = NULL; - return android.util.Log.d(tag, msg); + if (AppContext.DEBUG) + return android.util.Log.d(tag, msg == null ? NULL : msg); + else + return 0; } public static int d(String tag, String msg, Throwable tr) { - if (msg == null) - msg = NULL; - return android.util.Log.d(tag, msg, tr); + if (AppContext.DEBUG) + return android.util.Log.d(tag, msg == null ? NULL : msg, tr); + else + return 0; } public static int i(String tag, String msg) { - if (msg == null) - msg = NULL; - return android.util.Log.i(tag, msg); + if (AppContext.DEBUG) + return android.util.Log.i(tag, msg == null ? NULL : msg); + else + return 0; } public static int i(String tag, String msg, Throwable tr) { - if (msg == null) - msg = NULL; - return android.util.Log.i(tag, msg, tr); + if (AppContext.DEBUG) + return android.util.Log.i(tag, msg == null ? NULL : msg, tr); + else + return 0; } public static int w(String tag, String msg) { - if (msg == null) - msg = NULL; - return android.util.Log.w(tag, msg); + if (AppContext.DEBUG) + return android.util.Log.w(tag, msg == null ? NULL : msg); + else + return 0; } public static int w(String tag, String msg, Throwable tr) { - if (msg == null) - msg = NULL; - return android.util.Log.w(tag, msg, tr); + if (AppContext.DEBUG) + return android.util.Log.w(tag, msg == null ? NULL : msg, tr); + else + return 0; } public static int w(String tag, Throwable tr) { @@ -124,14 +134,16 @@ public class Log { } public static int e(String tag, String msg) { - if (msg == null) - msg = NULL; - return android.util.Log.e(tag, msg); + if (AppContext.DEBUG) + return android.util.Log.e(tag, msg == null ? NULL : msg); + else + return 0; } public static int e(String tag, String msg, Throwable tr) { - if (msg == null) - msg = NULL; - return android.util.Log.e(tag, msg, tr); + if (AppContext.DEBUG) + return android.util.Log.e(tag, msg == null ? NULL : msg, tr); + else + return 0; } }