Commit ec75c6db authored by fallenstardust's avatar fallenstardust

按设定资料语言决定先行服的名称语言

parent cdde8627
...@@ -94,11 +94,11 @@ public class ExCardActivity extends BaseActivity { ...@@ -94,11 +94,11 @@ public class ExCardActivity extends BaseActivity {
Toast.makeText(getContext(), R.string.ypk_installed, Toast.LENGTH_LONG).show(); Toast.makeText(getContext(), R.string.ypk_installed, Toast.LENGTH_LONG).show();
} }
String servername = ""; String servername = "";
if (getPackageName().equals(BuildConfig.APPLICATION_ID)) if (AppsSettings.get().getDataLanguage() == 0)
servername = "23333先行服务器"; servername = "23333先行服务器";
if (getPackageName().equals((BuildConfig.APPLICATION_ID) + ".KO")) if (AppsSettings.get().getDataLanguage() == 1)
servername = "YGOPRO 사전 게시 중국서버"; servername = "YGOPRO 사전 게시 중국서버";
if (getPackageName().equals((BuildConfig.APPLICATION_ID) + ".EN")) if (AppsSettings.get().getDataLanguage() == 2)
servername = "Mercury23333 OCG/TCG Pre-release"; servername = "Mercury23333 OCG/TCG Pre-release";
AddServer(servername, "s1.ygo233.com", 23333, "Knight of Hanoi"); AddServer(servername, "s1.ygo233.com", 23333, "Knight of Hanoi");
btn_download.setVisibility(View.GONE); btn_download.setVisibility(View.GONE);
......
...@@ -749,7 +749,6 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene ...@@ -749,7 +749,6 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
ll_new_notice.setVisibility(View.GONE); ll_new_notice.setVisibility(View.GONE);
Log.i("webCrawler", "webCrawler fail"); Log.i("webCrawler", "webCrawler fail");
}).done((tmp) -> { }).done((tmp) -> {
if (tmp != null) { if (tmp != null) {
Log.i("webCrawler", "webCrawler done"); Log.i("webCrawler", "webCrawler done");
Intent intent = new Intent(getActivity(), ExCardActivity.class); Intent intent = new Intent(getActivity(), ExCardActivity.class);
...@@ -765,7 +764,6 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene ...@@ -765,7 +764,6 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
aurl = aurl + "#pre_update_title"; aurl = aurl + "#pre_update_title";
} }
WebActivity.open(getContext(), getString(R.string.action_download_expansions), aurl); WebActivity.open(getContext(), getString(R.string.action_download_expansions), aurl);
ll_new_notice.setVisibility(View.GONE);
Log.i("webCrawler", "webCrawler cannot return ex-card data"); Log.i("webCrawler", "webCrawler cannot return ex-card data");
} }
//关闭异常 //关闭异常
...@@ -776,6 +774,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene ...@@ -776,6 +774,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
} catch (Exception ex) { } catch (Exception ex) {
} }
} }
ll_new_notice.setVisibility(View.GONE);
}); });
break; break;
......
...@@ -8,12 +8,6 @@ ...@@ -8,12 +8,6 @@
<!-- set the layout_height in the linear layout to “wrap_content” <!-- set the layout_height in the linear layout to “wrap_content”
so it doesn’t only show one TextView per page.--> so it doesn’t only show one TextView per page.-->
<!-- <LinearLayout
android:layout_width="@dimen/card_width_middle"
android:layout_height="@dimen/card_height_middle">
</LinearLayout>-->
<ImageView <ImageView
android:id="@+id/ex_card_image" android:id="@+id/ex_card_image"
android:layout_width="@dimen/card_width_middle" android:layout_width="@dimen/card_width_middle"
...@@ -49,7 +43,7 @@ ...@@ -49,7 +43,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="20dp" android:padding="20dp"
android:textSize="17sp" /> android:textSize="15sp" />
<View <View
android:id="@+id/view_bar" android:id="@+id/view_bar"
......
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