diff --git a/bin/EhViewer.apk b/bin/EhViewer.apk index 97e375358..82bf5d1c4 100644 Binary files a/bin/EhViewer.apk and b/bin/EhViewer.apk differ diff --git a/bin/R.txt b/bin/R.txt index 1020d9cff..661dc7fa5 100644 --- a/bin/R.txt +++ b/bin/R.txt @@ -261,30 +261,30 @@ int menu detail 0x7f0c0000 int menu main 0x7f0c0001 int raw change_log 0x7f050000 int raw thanks 0x7f050001 -int string _default 0x7f0a0093 -int string action_refresh 0x7f0a0057 -int string action_settings 0x7f0a0058 -int string actual_size 0x7f0a009b -int string add 0x7f0a008f -int string add_tag 0x7f0a0070 -int string add_to_favourite 0x7f0a009f -int string advance_search_left 0x7f0a00a5 +int string _default 0x7f0a0094 +int string action_refresh 0x7f0a0058 +int string action_settings 0x7f0a0059 +int string actual_size 0x7f0a009c +int string add 0x7f0a0090 +int string add_tag 0x7f0a0071 +int string add_to_favourite 0x7f0a00a0 +int string advance_search_left 0x7f0a00a6 int string app_name 0x7f0a0000 -int string cache_large 0x7f0a006d -int string changelog 0x7f0a0089 -int string check_login 0x7f0a0009 -int string checkbox_advance 0x7f0a0012 -int string checkbox_sdesc 0x7f0a0015 -int string checkbox_sdt1 0x7f0a0018 -int string checkbox_sdt2 0x7f0a0019 -int string checkbox_sh 0x7f0a001a -int string checkbox_sname 0x7f0a0013 -int string checkbox_sr 0x7f0a001b -int string checkbox_stags 0x7f0a0014 -int string checkbox_sto 0x7f0a0017 -int string checkbox_storr 0x7f0a0016 -int string checking_update 0x7f0a0029 -int string create_cache_error 0x7f0a006f +int string cache_large 0x7f0a006e +int string changelog 0x7f0a008a +int string check_login 0x7f0a000a +int string checkbox_advance 0x7f0a0013 +int string checkbox_sdesc 0x7f0a0016 +int string checkbox_sdt1 0x7f0a0019 +int string checkbox_sdt2 0x7f0a001a +int string checkbox_sh 0x7f0a001b +int string checkbox_sname 0x7f0a0014 +int string checkbox_sr 0x7f0a001c +int string checkbox_stags 0x7f0a0015 +int string checkbox_sto 0x7f0a0018 +int string checkbox_storr 0x7f0a0017 +int string checking_update 0x7f0a002a +int string create_cache_error 0x7f0a0070 int string dailog_check_network 0x7f0a0005 int string dailog_network_error_no 0x7f0a0007 int string dailog_network_error_yes 0x7f0a0006 @@ -292,141 +292,142 @@ int string dailog_waring_no 0x7f0a0004 int string dailog_waring_plain 0x7f0a0002 int string dailog_waring_title 0x7f0a0001 int string dailog_waring_yes 0x7f0a0003 -int string detail_average 0x7f0a0031 -int string detail_button_cancel 0x7f0a0036 -int string detail_button_every 0x7f0a0038 -int string detail_button_known 0x7f0a003a -int string detail_button_once 0x7f0a0037 -int string detail_button_read 0x7f0a0035 -int string detail_language 0x7f0a0030 -int string detail_not_rated 0x7f0a003c -int string detail_offensive 0x7f0a0034 -int string detail_offensive_title 0x7f0a0033 -int string detail_pages 0x7f0a002e -int string detail_people 0x7f0a0032 -int string detail_pining 0x7f0a0039 -int string detail_posted 0x7f0a002d -int string detail_preview_error 0x7f0a003b -int string detail_size 0x7f0a002f -int string detail_uploader 0x7f0a002c -int string develop 0x7f0a00a4 -int string dialog_messgae_login_or_not 0x7f0a000d -int string dialog_send_crash_no 0x7f0a0022 -int string dialog_send_crash_plain 0x7f0a0020 -int string dialog_send_crash_title 0x7f0a001f -int string dialog_send_crash_yes 0x7f0a0021 -int string dialog_title_login_or_not 0x7f0a000c -int string download 0x7f0a0096 -int string download_successfully 0x7f0a007f -int string download_task_finished 0x7f0a007d -int string download_unsuccessfully 0x7f0a0080 -int string downloading 0x7f0a007e -int string em_can_not_reach 0x7f0a0053 -int string em_check_login_error 0x7f0a004c -int string em_client_protocol 0x7f0a0048 -int string em_host_error 0x7f0a0056 -int string em_login_error 0x7f0a004b -int string em_logout_error 0x7f0a004d -int string em_network_error 0x7f0a0042 -int string em_no_network 0x7f0a0052 -int string em_no_network_2 0x7f0a0054 -int string em_open_input_stream_error 0x7f0a0046 -int string em_parser_error 0x7f0a0045 -int string em_put_cache_error 0x7f0a0049 -int string em_read_input_stream_error 0x7f0a0047 -int string em_request_error 0x7f0a0055 -int string em_response_code_error 0x7f0a0044 -int string em_retry 0x7f0a004f -int string em_retry_times 0x7f0a0050 -int string em_timeout 0x7f0a0043 -int string em_unknown_error 0x7f0a0051 -int string em_url_error 0x7f0a004e -int string em_url_format_error 0x7f0a004a -int string error 0x7f0a0088 -int string exit_tip 0x7f0a0008 -int string favourite 0x7f0a0095 -int string first_page 0x7f0a003e -int string fit_to_height 0x7f0a009d -int string fit_to_screen 0x7f0a009e -int string fit_to_width 0x7f0a009c -int string found_update 0x7f0a002b -int string hint_no_keyword 0x7f0a0011 -int string homepage 0x7f0a0094 -int string input_error 0x7f0a006e -int string jump 0x7f0a0091 -int string jump_sum 0x7f0a001c -int string jump_to 0x7f0a001d -int string landscape 0x7f0a005c -int string last_page 0x7f0a0083 -int string list_title 0x7f0a0026 -int string load_pre 0x7f0a003d -int string login 0x7f0a008a -int string logout 0x7f0a008b -int string new_tag_name 0x7f0a0075 -int string no_found 0x7f0a0025 -int string not_login 0x7f0a000e -int string not_started 0x7f0a0081 -int string password 0x7f0a008e -int string period 0x7f0a0086 -int string portrait 0x7f0a005b -int string preference_author 0x7f0a006b -int string preference_author_summary 0x7f0a006c -int string preference_auto_page_cache 0x7f0a0066 -int string preference_auto_page_cache_summary_off 0x7f0a0068 -int string preference_auto_page_cache_summary_on 0x7f0a0067 -int string preference_cache_summary 0x7f0a0064 -int string preference_cache_summary_no 0x7f0a0065 -int string preference_category_about 0x7f0a006a -int string preference_category_cache 0x7f0a005f -int string preference_category_display 0x7f0a0059 -int string preference_clear_cp_cache 0x7f0a0061 -int string preference_clear_page_cache 0x7f0a0063 -int string preference_cp_cache 0x7f0a0060 -int string preference_download_path 0x7f0a0069 -int string preference_page_cache 0x7f0a0062 -int string preference_page_scaling 0x7f0a005d -int string preference_screen_ori 0x7f0a005a -int string preference_settings_title 0x7f0a005e -int string pull_next_pull 0x7f0a007a -int string pull_next_release 0x7f0a007b -int string pull_pre_pull 0x7f0a0078 -int string pull_pre_release 0x7f0a0079 -int string pull_refresh_pull 0x7f0a0076 -int string pull_refresh_release 0x7f0a0077 -int string refresh 0x7f0a0087 -int string remove 0x7f0a00a0 -int string remove_info_data 0x7f0a00a1 -int string retry_max_next 0x7f0a0041 -int string retry_max_pre 0x7f0a0040 -int string sadpanda 0x7f0a0084 -int string some_page 0x7f0a0092 -int string star_2 0x7f0a0097 -int string star_3 0x7f0a0098 -int string star_4 0x7f0a0099 -int string star_5 0x7f0a009a -int string start_download_task 0x7f0a007c -int string start_reloading 0x7f0a003f -int string tag_change_name 0x7f0a0074 -int string tag_name 0x7f0a0071 -int string tag_name_empty 0x7f0a0072 -int string tag_name_exist 0x7f0a0073 -int string tap_update 0x7f0a0028 -int string thanks 0x7f0a00a3 -int string toast_add_download 0x7f0a0024 -int string toast_add_favourite 0x7f0a0023 -int string toast_invalid_page 0x7f0a001e -int string toast_login_failed 0x7f0a000b -int string toast_login_succeeded 0x7f0a000a -int string toast_logout_failed 0x7f0a0010 -int string toast_logout_succeeded 0x7f0a000f -int string unfinished 0x7f0a0085 -int string up_to_date 0x7f0a002a -int string update 0x7f0a00a2 -int string update_message 0x7f0a0027 -int string username 0x7f0a008d -int string wait 0x7f0a008c -int string waiting 0x7f0a0082 -int string what_to_do 0x7f0a0090 +int string detail_average 0x7f0a0032 +int string detail_button_cancel 0x7f0a0037 +int string detail_button_every 0x7f0a0039 +int string detail_button_known 0x7f0a003b +int string detail_button_once 0x7f0a0038 +int string detail_button_read 0x7f0a0036 +int string detail_language 0x7f0a0031 +int string detail_not_rated 0x7f0a003d +int string detail_offensive 0x7f0a0035 +int string detail_offensive_title 0x7f0a0034 +int string detail_pages 0x7f0a002f +int string detail_people 0x7f0a0033 +int string detail_pining 0x7f0a003a +int string detail_posted 0x7f0a002e +int string detail_preview_error 0x7f0a003c +int string detail_size 0x7f0a0030 +int string detail_uploader 0x7f0a002d +int string develop 0x7f0a00a5 +int string dialog_messgae_login_or_not 0x7f0a000e +int string dialog_send_crash_no 0x7f0a0023 +int string dialog_send_crash_plain 0x7f0a0021 +int string dialog_send_crash_title 0x7f0a0020 +int string dialog_send_crash_yes 0x7f0a0022 +int string dialog_title_login_or_not 0x7f0a000d +int string dialog_wait_send_crash_msg 0x7f0a0008 +int string download 0x7f0a0097 +int string download_successfully 0x7f0a0080 +int string download_task_finished 0x7f0a007e +int string download_unsuccessfully 0x7f0a0081 +int string downloading 0x7f0a007f +int string em_can_not_reach 0x7f0a0054 +int string em_check_login_error 0x7f0a004d +int string em_client_protocol 0x7f0a0049 +int string em_host_error 0x7f0a0057 +int string em_login_error 0x7f0a004c +int string em_logout_error 0x7f0a004e +int string em_network_error 0x7f0a0043 +int string em_no_network 0x7f0a0053 +int string em_no_network_2 0x7f0a0055 +int string em_open_input_stream_error 0x7f0a0047 +int string em_parser_error 0x7f0a0046 +int string em_put_cache_error 0x7f0a004a +int string em_read_input_stream_error 0x7f0a0048 +int string em_request_error 0x7f0a0056 +int string em_response_code_error 0x7f0a0045 +int string em_retry 0x7f0a0050 +int string em_retry_times 0x7f0a0051 +int string em_timeout 0x7f0a0044 +int string em_unknown_error 0x7f0a0052 +int string em_url_error 0x7f0a004f +int string em_url_format_error 0x7f0a004b +int string error 0x7f0a0089 +int string exit_tip 0x7f0a0009 +int string favourite 0x7f0a0096 +int string first_page 0x7f0a003f +int string fit_to_height 0x7f0a009e +int string fit_to_screen 0x7f0a009f +int string fit_to_width 0x7f0a009d +int string found_update 0x7f0a002c +int string hint_no_keyword 0x7f0a0012 +int string homepage 0x7f0a0095 +int string input_error 0x7f0a006f +int string jump 0x7f0a0092 +int string jump_sum 0x7f0a001d +int string jump_to 0x7f0a001e +int string landscape 0x7f0a005d +int string last_page 0x7f0a0084 +int string list_title 0x7f0a0027 +int string load_pre 0x7f0a003e +int string login 0x7f0a008b +int string logout 0x7f0a008c +int string new_tag_name 0x7f0a0076 +int string no_found 0x7f0a0026 +int string not_login 0x7f0a000f +int string not_started 0x7f0a0082 +int string password 0x7f0a008f +int string period 0x7f0a0087 +int string portrait 0x7f0a005c +int string preference_author 0x7f0a006c +int string preference_author_summary 0x7f0a006d +int string preference_auto_page_cache 0x7f0a0067 +int string preference_auto_page_cache_summary_off 0x7f0a0069 +int string preference_auto_page_cache_summary_on 0x7f0a0068 +int string preference_cache_summary 0x7f0a0065 +int string preference_cache_summary_no 0x7f0a0066 +int string preference_category_about 0x7f0a006b +int string preference_category_cache 0x7f0a0060 +int string preference_category_display 0x7f0a005a +int string preference_clear_cp_cache 0x7f0a0062 +int string preference_clear_page_cache 0x7f0a0064 +int string preference_cp_cache 0x7f0a0061 +int string preference_download_path 0x7f0a006a +int string preference_page_cache 0x7f0a0063 +int string preference_page_scaling 0x7f0a005e +int string preference_screen_ori 0x7f0a005b +int string preference_settings_title 0x7f0a005f +int string pull_next_pull 0x7f0a007b +int string pull_next_release 0x7f0a007c +int string pull_pre_pull 0x7f0a0079 +int string pull_pre_release 0x7f0a007a +int string pull_refresh_pull 0x7f0a0077 +int string pull_refresh_release 0x7f0a0078 +int string refresh 0x7f0a0088 +int string remove 0x7f0a00a1 +int string remove_info_data 0x7f0a00a2 +int string retry_max_next 0x7f0a0042 +int string retry_max_pre 0x7f0a0041 +int string sadpanda 0x7f0a0085 +int string some_page 0x7f0a0093 +int string star_2 0x7f0a0098 +int string star_3 0x7f0a0099 +int string star_4 0x7f0a009a +int string star_5 0x7f0a009b +int string start_download_task 0x7f0a007d +int string start_reloading 0x7f0a0040 +int string tag_change_name 0x7f0a0075 +int string tag_name 0x7f0a0072 +int string tag_name_empty 0x7f0a0073 +int string tag_name_exist 0x7f0a0074 +int string tap_update 0x7f0a0029 +int string thanks 0x7f0a00a4 +int string toast_add_download 0x7f0a0025 +int string toast_add_favourite 0x7f0a0024 +int string toast_invalid_page 0x7f0a001f +int string toast_login_failed 0x7f0a000c +int string toast_login_succeeded 0x7f0a000b +int string toast_logout_failed 0x7f0a0011 +int string toast_logout_succeeded 0x7f0a0010 +int string unfinished 0x7f0a0086 +int string up_to_date 0x7f0a002b +int string update 0x7f0a00a3 +int string update_message 0x7f0a0028 +int string username 0x7f0a008e +int string wait 0x7f0a008d +int string waiting 0x7f0a0083 +int string what_to_do 0x7f0a0091 int style ActionBar 0x7f0b0000 int style AppTheme 0x7f0b0009 int style AppTheme_NoActionBar 0x7f0b000a diff --git a/bin/classes.dex b/bin/classes.dex index 8684dd772..2fdc94631 100644 Binary files a/bin/classes.dex and b/bin/classes.dex differ diff --git a/bin/resources.ap_ b/bin/resources.ap_ index bc5cb89c9..6036367d0 100644 Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ diff --git a/res/raw/change_log b/res/raw/change_log index cc959580b..9fc8d3f11 100644 --- a/res/raw/change_log +++ b/res/raw/change_log @@ -1,8 +1,10 @@ Version 0.3.2 (2014-??-??) * 添加启动界面 * 添加自动更新 +* 添加检测登陆状态按钮 * 优化下拉控件 * 优化侧边栏 +* 优化漫画列表 * 列表标题显示内容 * 后台检查登陆状态 * 设置中添加移除所有应用通知项 diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 141ebaf2e..0d40e4523 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -49,6 +49,7 @@ 上次该应用崩溃了。你愿意把日志发送给开发者以便以后得到更好的用户体验么? 我愿意 门儿都没有 + 请在发送完日志后关闭该窗口 已添加到收藏 diff --git a/res/values/strings.xml b/res/values/strings.xml index 193396023..da6c0cb80 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -13,6 +13,7 @@ Checking network I don\'t care Fine + Please close the dialog after sending logcat Click again to exit diff --git a/src/com/hippo/ehviewer/StartActivity.java b/src/com/hippo/ehviewer/StartActivity.java index 2fc4cb86c..b0bc52b1d 100644 --- a/src/com/hippo/ehviewer/StartActivity.java +++ b/src/com/hippo/ehviewer/StartActivity.java @@ -42,7 +42,7 @@ public class StartActivity extends Activity { ((AlertButton)v).dialog.dismiss(); Config.allowed(); - check(CHECK_CRESH); + check(CHECK_NETWORK); } }).setNegativeButton(R.string.dailog_waring_no, new View.OnClickListener() { @@ -54,6 +54,28 @@ public class StartActivity extends Activity { }).create(); } + private AlertDialog createNetworkErrorDialog() { + return new DialogBuilder(this).setCancelable(false) + .setTitle(R.string.error).setMessage(R.string.em_no_network) + .setPositiveButton(R.string.dailog_network_error_yes, + new View.OnClickListener() { + @Override + public void onClick(View v) { + ((AlertButton)v).dialog.dismiss(); + + check(CHECK_CRESH); + } + }) + .setNegativeButton(R.string.dailog_network_error_no, + new View.OnClickListener() { + @Override + public void onClick(View v) { + ((AlertButton)v).dialog.dismiss(); + finish(); + } + }).create(); + } + private AlertDialog createSendCrashDialog() { return new DialogBuilder(this).setCancelable(false) .setTitle(R.string.dialog_send_crash_title) @@ -62,14 +84,25 @@ public class StartActivity extends Activity { @Override public void onClick(View v) { ((AlertButton)v).dialog.dismiss(); + + new DialogBuilder(StartActivity.this).setCancelable(false) + .setTitle(R.string.wait) + .setMessage(R.string.dialog_wait_send_crash_msg) + .setPositiveButton(android.R.string.ok, + new View.OnClickListener() { + @Override + public void onClick(View v) { + ((AlertButton)v).dialog.dismiss(); + checkOver(); + } + }).show(); + Intent i = new Intent(Intent.ACTION_SENDTO); i.setData(Uri.parse("mailto:ehviewersu@gmail.com")); i.putExtra(Intent.EXTRA_SUBJECT, "I found a bug in EhViewer !"); i.putExtra(Intent.EXTRA_TEXT, lastCrash); startActivity(i); lastCrash = null; - - check(CHECK_NETWORK); } }).setNegativeButton(R.string.dialog_send_crash_no, new View.OnClickListener() { @@ -78,29 +111,8 @@ public class StartActivity extends Activity { ((AlertButton)v).dialog.dismiss(); lastCrash = null; - check(CHECK_NETWORK); - } - }).create(); - } - - private AlertDialog createNetworkErrorDialog() { - return new DialogBuilder(this).setCancelable(false) - .setTitle(R.string.error).setMessage(R.string.em_no_network) - .setPositiveButton(R.string.dailog_network_error_yes, - new View.OnClickListener() { - @Override - public void onClick(View v) { - ((AlertButton)v).dialog.dismiss(); checkOver(); } - }) - .setNegativeButton(R.string.dailog_network_error_no, - new View.OnClickListener() { - @Override - public void onClick(View v) { - ((AlertButton)v).dialog.dismiss(); - finish(); - } }).create(); } @@ -138,16 +150,16 @@ public class StartActivity extends Activity { createWarningDialog().show(); return; } - case CHECK_CRESH: - if ((lastCrash = Crash.getLastCrash()) != null) { - createSendCrashDialog().show(); - return; - } case CHECK_NETWORK: if (!isNetworkAvailable()) { createNetworkErrorDialog().show(); return; } + case CHECK_CRESH: + if ((lastCrash = Crash.getLastCrash()) != null) { + createSendCrashDialog().show(); + return; + } } checkOver(); } diff --git a/src/com/hippo/ehviewer/activity/MangaDetailActivity.java b/src/com/hippo/ehviewer/activity/MangaDetailActivity.java index 4356c9a12..58d62a62b 100644 --- a/src/com/hippo/ehviewer/activity/MangaDetailActivity.java +++ b/src/com/hippo/ehviewer/activity/MangaDetailActivity.java @@ -439,6 +439,9 @@ public class MangaDetailActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.detail); + // Get error here + Log.d(TAG, null); + int screenOri = Config.getScreenOriMode(); if (screenOri != getRequestedOrientation()) setRequestedOrientation(screenOri);