Skip to content

Y
YGOMobile
Commit 623e7f02 authored by fallenstardust's avatar fallenstardust
Browse files
Options

更新多语言先行卡下载地址

parent 52392bce
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 36 deletions
mobile/src/main/java/cn/garymb/ygomobile/Constants.java
View file @ 623e7f02
......@@ -167,8 +167,8 @@ public interface Constants {
String URL_YGO233_ADVANCE = "";//"https://ygo233.com/pre#pre_release_cards";//关闭233先行卡服务器，但不要删除该字段，许多未调用的遗留代码使用该contant
String URL_CN_DATAVER = "https://cdn02.moecube.com:444/ygopro-super-pre/data/version.txt";
String URL_PRE_CARD = "https://cdn02.moecube.com:444/ygopro-super-pre/data/test-release.json";
String URL_YGO233_FILE = "https://cdn02.moecube.com:444/ygopro-super-pre/archive/ygopro-super-pre.ypk";
String URL_YGO233_FILE_ALT = "https://cdn02.moecube.com:444/ygopro-super-pre/archive/ygopro-super-pre.ypk";
String URL_SUPERPRE_CN_FILE = "https://cdn02.moecube.com:444/ygopro-super-pre/archive/ygopro-super-pre.ypk";
String URL_SUPERPRE_CN_FILE_ALT = "https://cdn02.moecube.com:444/ygopro-super-pre/archive/ygopro-super-pre.ypk";
String URL_YGO233_BUG_REPORT = "https://ygo233.com/pre#faq";
int PORT_Mycard_Super_Pre_Server = 888;
String URL_Mycard_Super_Pre_Server = "mygo.superpre.pro";
......
mobile/src/main/java/cn/garymb/ygomobile/ex_card/ExCardListFragment.java
View file @ 623e7f02
package cn.garymb.ygomobile.ex_card;
import static cn.garymb.ygomobile.Constants.URL_CN_DATAVER;
import static cn.garymb.ygomobile.Constants.URL_YGO233_FILE;
import static cn.garymb.ygomobile.Constants.URL_YGO233_FILE_ALT;
import static cn.garymb.ygomobile.utils.DownloadUtil.TYPE_DOWNLOAD_EXCEPTION;
import static cn.garymb.ygomobile.utils.ServerUtil.AddServer;
......@@ -93,7 +90,7 @@ public class ExCardListFragment extends Fragment {
LogUtil.i(TAG, "start download");
if (downloadState != DownloadState.DOWNLOAD_ING) {
downloadState = DownloadState.DOWNLOAD_ING;
downloadfromWeb(URL_FILE);
downloadfromWeb(ServerUtil.downloadUrl());
}
}
});
......@@ -205,7 +202,7 @@ public class ExCardListFragment extends Fragment {
++FailedCount;
if (FailedCount <= 2) {
YGOUtil.showTextToast(getString(R.string.Ask_to_Change_Other_Way));
downloadfromWeb(URL_YGO233_FILE_ALT);
downloadfromWeb(ServerUtil.downloadUrl());
}
YGOUtil.showTextToast("error:" + getString(R.string.Download_Precard_Failed));
break;
......
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
View file @ 623e7f02
......@@ -105,7 +105,7 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat
//showNewbieGuide("homePage");
initBottomNavigationBar();
onNewIntent(getIntent());
ServerUtil.initExCardState(this);//检查扩展卡版本
ServerUtil.initExCardState();//检查扩展卡版本
}
@Override
......@@ -318,7 +318,7 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat
@Override
protected void onResume() {
super.onResume();
ServerUtil.initExCardState(this);//检查扩展卡版本
ServerUtil.initExCardState();//检查扩展卡版本
}
@Override
......
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeFragment.java
View file @ 623e7f02
......@@ -149,7 +149,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
if (!EventBus.getDefault().isRegistered(this)) {//加上判断
EventBus.getDefault().register(this);
}
ServerUtil.initExCardState(getActivity());//LogoActivity中会调用一次本函数，此处再次调用的原因：有时HomeFragment的onCreateView()函数执行较慢，导致initExCardState()中eventbus事件发布完毕后仍未注册，因此在此处再调用一次检查，再次发布
ServerUtil.initExCardState();//LogoActivity中会调用一次本函数，此处再次调用的原因：有时HomeFragment的onCreateView()函数执行较慢，导致initExCardState()中eventbus事件发布完毕后仍未注册，因此在此处再调用一次检查，再次发布
changeColor();
try {
ServerUtil.refreshServer(activity);
......
mobile/src/main/java/cn/garymb/ygomobile/ui/settings/SettingFragment.java
View file @ 623e7f02
......@@ -38,7 +38,7 @@ import static cn.garymb.ygomobile.Constants.SETTINGS_AVATAR;
import static cn.garymb.ygomobile.Constants.SETTINGS_CARD_BG;
import static cn.garymb.ygomobile.Constants.SETTINGS_COVER;
import static cn.garymb.ygomobile.Constants.URL_HOME_VERSION;
import static cn.garymb.ygomobile.Constants.URL_YGO233_FILE_ALT;
import static cn.garymb.ygomobile.Constants.URL_SUPERPRE_CN_FILE_ALT;
import static cn.garymb.ygomobile.ui.home.HomeActivity.Cache_pre_release_code;
import static cn.garymb.ygomobile.ui.home.HomeActivity.pre_code_list;
import static cn.garymb.ygomobile.ui.home.HomeActivity.released_code_list;
......@@ -290,7 +290,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
case TYPE_SETTING_GET_VERSION_FAILED:
++FailedCount;
if (FailedCount <= 2) {
checkUpgrade(URL_YGO233_FILE_ALT);
checkUpgrade(URL_HOME_VERSION);
} else {
Toast.makeText(getContext(), getString(R.string.Checking_Update_Failed) + msg.obj.toString(), Toast.LENGTH_SHORT).show();
}
......
mobile/src/main/java/cn/garymb/ygomobile/utils/ServerUtil.java
View file @ 623e7f02
......@@ -41,12 +41,6 @@ import okhttp3.Response;
public class ServerUtil {
private static final String TAG = ServerUtil.class.getSimpleName();
public enum ExCardState {
/* 已安装最新版扩展卡，扩展卡不是最新版本，无法查询到服务器版本 */
UNCHECKED, UPDATED, NEED_UPDATE, ERROR
}
/* 存储了当前先行卡是否需要更新的状态，UI逻辑直接读取该变量就能获知是否已安装先行卡 */
public volatile static ExCardState exCardState = ExCardState.UNCHECKED;//TODO 可能有并发问题
public volatile static String serverExCardVersion = "";
......@@ -57,26 +51,23 @@ public class ServerUtil {
* 比对服务器的先行卡版本号与本地先行卡版本号，
* 更新全局变量exCardVersion（如删除先行卡、重新安装先行卡等）
*/
public static void initExCardState(Context context) {
public static void initExCardState() {
String oldVer = SharedPreferenceUtil.getExpansionDataVer();
LogUtil.i(TAG, "server util, old pre-card version:" + oldVer);
String language = context.getResources().getConfiguration().locale.getLanguage();
String id = "";
String URL_DATAVER = URL_CN_DATAVER;
if (!language.isEmpty()) {
if (AppsSettings.get().getDataLanguage() == -1) {
if (language.equals(AppsSettings.languageEnum.English.name)) id = "EN";
if (language.equals(AppsSettings.languageEnum.Korean.name)) id = "KR";
if (language.equals(AppsSettings.languageEnum.Spanish.name)) id = "ES";
if (language.equals(AppsSettings.languageEnum.Japanese)) id = "JP";
} else {
if (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.Korean.code) id = "KR";
if (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.English.code) id = "EN";
if (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.Spanish.code) id = "ES";
if (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.Japanese.code) id = "JP";
}
URL_DATAVER = (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.Chinese.code) ? URL_CN_DATAVER : "https://github.com/DaruKani/TransSuperpre/blob/main/" + id + "/version.txt";
}
if (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.Korean.code)
id = "KR";
if (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.English.code)
id = "EN";
if (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.Spanish.code)
id = "ES";
if (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.Japanese.code)
id = "JP";
URL_DATAVER = (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.Chinese.code) ? URL_CN_DATAVER : "https://github.com/DaruKani/TransSuperpre/blob/main/" + id + "/version.txt";
Log.w("seesee", URL_DATAVER);
OkhttpUtil.get(URL_DATAVER, new Callback() {
@Override
public void onFailure(Call call, IOException e) {
......@@ -87,7 +78,7 @@ public class ServerUtil {
if (failCounter < 10) {
LogUtil.i(TAG, "network failed, retry fetch pre-card version:");
failCounter++;
initExCardState(context);
initExCardState();
}
}
......@@ -192,7 +183,6 @@ public class ServerUtil {
}
}
/**
* 读取xmlFile指定的本地文件server_list.xml和apk资源文件（assets）下的serverlist.xml，返回其中版本最新的
*
......@@ -320,4 +310,25 @@ public class ServerUtil {
return (port == Constants.PORT_Mycard_Super_Pre_Server && (addr.equals(Constants.URL_Mycard_Super_Pre_Server) || addr.equals(Constants.URL_Mycard_Super_Pre_Server_2)));
}
public static String downloadUrl() {
String url;
String id ="";
if (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.Korean.code)
id = "KR";
if (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.English.code)
id = "EN";
if (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.Spanish.code)
id = "ES";
if (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.Japanese.code)
id = "JP";
url = (AppsSettings.get().getDataLanguage() == AppsSettings.languageEnum.Chinese.code) ? URL_CN_DATAVER : "https://raw.githubusercontent.com/DaruKani/TransSuperpre/refs/heads/main/" + id + "/ygopro-super-pre.ypk";
Log.w("seesee",url);
return url;
}
public enum ExCardState {
/* 已安装最新版扩展卡，扩展卡不是最新版本，无法查询到服务器版本 */
UNCHECKED, UPDATED, NEED_UPDATE, ERROR
}
}
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