Commit 7c77f20a authored by fallenstardust's avatar fallenstardust

adapt strings

parent fa76a272
...@@ -709,7 +709,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView ...@@ -709,7 +709,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
//复制前关闭决斗助手 //复制前关闭决斗助手
stopService(new Intent(this, ServiceDuelAssistant.class)); stopService(new Intent(this, ServiceDuelAssistant.class));
Util.fzMessage(this,mDeckAdapater.getDeckInfo().toDeck().toAppUri().toString()); Util.fzMessage(this,mDeckAdapater.getDeckInfo().toDeck().toAppUri().toString());
showToast("已复制卡组代码到剪贴板"); showToast(getString(R.string.deck_text_copyed));
//复制完毕开启决斗助手 //复制完毕开启决斗助手
Util.startDuelService(this); Util.startDuelService(this);
// String label = TextUtils.isEmpty(deck.getName()) ? getString(R.string.share_deck) : deck.getName(); // String label = TextUtils.isEmpty(deck.getName()) ? getString(R.string.share_deck) : deck.getName();
......
...@@ -157,16 +157,16 @@ public class ServiceDuelAssistant extends Service { ...@@ -157,16 +157,16 @@ public class ServiceDuelAssistant extends Service {
for (String s : DeckTextKey) { for (String s : DeckTextKey) {
//只要包含其中一个关键字就视为卡组 //只要包含其中一个关键字就视为卡组
if (clipMessage.contains(s)) { if (clipMessage.contains(s)) {
saveDeck(clipMessage,false); saveDeck(clipMessage, false);
return; return;
} }
} }
return; return;
} }
//如果是卡组url //如果是卡组url
int deckStart=clipMessage.indexOf(DECK_URL_PREFIX); int deckStart = clipMessage.indexOf(DECK_URL_PREFIX);
if (deckStart!=-1){ if (deckStart != -1) {
saveDeck(clipMessage.substring(deckStart+DECK_URL_PREFIX.length(),clipMessage.length()),true); saveDeck(clipMessage.substring(deckStart + DECK_URL_PREFIX.length(), clipMessage.length()), true);
return; return;
} }
...@@ -323,7 +323,7 @@ public class ServiceDuelAssistant extends Service { ...@@ -323,7 +323,7 @@ public class ServiceDuelAssistant extends Service {
} }
private void saveDeck(String deckMessage, boolean isUrl) { private void saveDeck(String deckMessage, boolean isUrl) {
tv_message.setText("检测到卡组文本,是否保存?"); tv_message.setText(R.string.find_deck_text);
bt_close.setText(R.string.search_close); bt_close.setText(R.string.search_close);
bt_join.setText("保存并打开"); bt_join.setText("保存并打开");
disJoinDialog(); disJoinDialog();
...@@ -346,7 +346,7 @@ public class ServiceDuelAssistant extends Service { ...@@ -346,7 +346,7 @@ public class ServiceDuelAssistant extends Service {
disJoinDialog(); disJoinDialog();
//如果是卡组url //如果是卡组url
if (isUrl) { if (isUrl) {
Deck deckInfo = new Deck("助手保存:" + System.currentTimeMillis(),Uri.parse(deckMessage)); Deck deckInfo = new Deck("助手保存:" + System.currentTimeMillis(), Uri.parse(deckMessage));
File file = deckInfo.saveTemp(AppsSettings.get().getDeckDir()); File file = deckInfo.saveTemp(AppsSettings.get().getDeckDir());
Intent startdeck = new Intent(ServiceDuelAssistant.this, DeckManagerActivity.getDeckManager()); Intent startdeck = new Intent(ServiceDuelAssistant.this, DeckManagerActivity.getDeckManager());
startdeck.putExtra(Intent.EXTRA_TEXT, file.getAbsolutePath()); startdeck.putExtra(Intent.EXTRA_TEXT, file.getAbsolutePath());
...@@ -363,7 +363,7 @@ public class ServiceDuelAssistant extends Service { ...@@ -363,7 +363,7 @@ public class ServiceDuelAssistant extends Service {
startActivity(startdeck); startActivity(startdeck);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
Toast.makeText(ServiceDuelAssistant.this, "保存失败,原因为" + e, Toast.LENGTH_SHORT).show(); Toast.makeText(ServiceDuelAssistant.this, getString(R.string.save_failed_bcos) + e, Toast.LENGTH_SHORT).show();
} }
} }
} }
......
...@@ -246,4 +246,11 @@ ...@@ -246,4 +246,11 @@
<string name="invalid_shortcut">잘못된 바로 가기</string> <string name="invalid_shortcut">잘못된 바로 가기</string>
<string name="return_to_duel">게임으로 돌아가다☞</string> <string name="return_to_duel">게임으로 돌아가다☞</string>
<string name="Start_ServiceDuelAssistant">결투 보조원</string> <string name="Start_ServiceDuelAssistant">결투 보조원</string>
<string name="about_DuelAssistant">다음 기능을 사용하도록 권한 설정이 필요합니다.
\n게임 코드를 통한 방 입장
\n“?”을 이용한 카드 검색
\n덱 코드를 이용한 덱공유</string>
<string name="find_deck_text">덱 공유 코드가 감지 되었습니다. 덱을 저장하겠습니까?</string>
<string name="save_failed_bcos">다음 이유로 인해 저장에 실패했습니다:</string>
<string name="deck_text_copyed">덱 공유 코드를 클립보드에 복사했습니다</string>
</resources> </resources>
...@@ -245,4 +245,11 @@ ...@@ -245,4 +245,11 @@
<string name="invalid_shortcut">无效的快捷方式</string> <string name="invalid_shortcut">无效的快捷方式</string>
<string name="return_to_duel">返回决斗☞</string> <string name="return_to_duel">返回决斗☞</string>
<string name="Start_ServiceDuelAssistant">开启决斗助手</string> <string name="Start_ServiceDuelAssistant">开启决斗助手</string>
<string name="about_DuelAssistant">开启以使用以下功能
\n复制约战房间号直接加房
\n复制“?”+关键词直接查询卡片
\n复制卡组文本直接保存为卡组并在卡组编辑打开它</string>
<string name="find_deck_text">检测到卡组文本,是否保存?</string>
<string name="save_failed_bcos">保存失败,原因为</string>
<string name="deck_text_copyed">已复制卡组文本到剪贴板</string>
</resources> </resources>
...@@ -245,4 +245,11 @@ ...@@ -245,4 +245,11 @@
<string name="invalid_shortcut">Invalid Shortcut</string> <string name="invalid_shortcut">Invalid Shortcut</string>
<string name="return_to_duel">Return to Duel☞</string> <string name="return_to_duel">Return to Duel☞</string>
<string name="Start_ServiceDuelAssistant">DuelAssistant</string> <string name="Start_ServiceDuelAssistant">DuelAssistant</string>
<string name="about_DuelAssistant">Turn on to use Functions as follow
\nCopy PSW to Quick Join Game.
\nCopy Keywords to Search Cards.
\nCopy Deck Text to Save as YDK and Open in Deck Editor</string>
<string name="find_deck_text">Find your copyed Deck Text, Save or Not?</string>
<string name="save_failed_bcos">save failed bcos of</string>
<string name="deck_text_copyed">Deck Text copyed</string>
</resources> </resources>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<CheckBoxPreference <CheckBoxPreference
android:key="pref_key_start_serviceduelassistant" android:key="pref_key_start_serviceduelassistant"
android:persistent="true" android:persistent="true"
android:summary="快速卡查,加入决斗等" android:summary="@string/About_DuelAssistant"
android:title="@string/Start_ServiceDuelAssistant"/> android:title="@string/Start_ServiceDuelAssistant"/>
<CheckBoxPreference <CheckBoxPreference
android:key="pref_key_game_sound_effect" android:key="pref_key_game_sound_effect"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment