Commit 2631359a authored by fallenstardust's avatar fallenstardust

encode by UTF-8

parent 1520c6c4
...@@ -70,7 +70,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener ...@@ -70,7 +70,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener
private int FailedCount; private int FailedCount;
/** /**
* 用于标志当前下载状态,用于防止用户多次重复点击“下载按钮” * 用于标志当前下载状态,用于防止用户多次重复点击“下载按钮”
* Mark the download state, which can prevent user from clicking the download button * Mark the download state, which can prevent user from clicking the download button
* repeatedly. * repeatedly.
*/ */
...@@ -91,7 +91,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener ...@@ -91,7 +91,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener
this.context = getContext(); this.context = getContext();
initView(layoutView); initView(layoutView);
if (!EventBus.getDefault().isRegistered(this)) {//加上判断 if (!EventBus.getDefault().isRegistered(this)) {//加上判断
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
} }
return layoutView; return layoutView;
...@@ -101,7 +101,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener ...@@ -101,7 +101,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener
public void onStop() { public void onStop() {
super.onStop(); super.onStop();
LogUtil.i(TAG, "excard fragment on stop"); LogUtil.i(TAG, "excard fragment on stop");
if (EventBus.getDefault().isRegistered(this))//加上判断 if (EventBus.getDefault().isRegistered(this))//加上判断
EventBus.getDefault().unregister(this); EventBus.getDefault().unregister(this);
} }
...@@ -134,11 +134,11 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener ...@@ -134,11 +134,11 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener
} }
/** /**
* 根据先行卡包状态改变按钮样式 * 根据先行卡包状态改变按钮样式
*/ */
public void changeDownloadText() { public void changeDownloadText() {
if (ServerUtil.exCardState == ServerUtil.ExCardState.UPDATED) { if (ServerUtil.exCardState == ServerUtil.ExCardState.UPDATED) {
//btn_download展示默认视图 //btn_download展示默认视图
textDownload.setText(R.string.tip_redownload); textDownload.setText(R.string.tip_redownload);
} else if (ServerUtil.exCardState == ServerUtil.ExCardState.NEED_UPDATE) { } else if (ServerUtil.exCardState == ServerUtil.ExCardState.NEED_UPDATE) {
textDownload.setText(R.string.Download); textDownload.setText(R.string.Download);
...@@ -172,21 +172,21 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener ...@@ -172,21 +172,21 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener
break; break;
case UnzipUtils.ZIP_UNZIP_OK: case UnzipUtils.ZIP_UNZIP_OK:
/* 将先行服务器信息添加到服务器列表中 */ /* 将先行服务器信息添加到服务器列表中 */
String servername = ""; String servername = "";
if (AppsSettings.get().getDataLanguage() == 0) if (AppsSettings.get().getDataLanguage() == 0)
servername = "23333先行服务器"; servername = "23333先行服务器";
if (AppsSettings.get().getDataLanguage() == 1) if (AppsSettings.get().getDataLanguage() == 1)
servername = "YGOPRO ?? ?? ????"; servername = "YGOPRO ?? ?? ????";
if (AppsSettings.get().getDataLanguage() == 2) if (AppsSettings.get().getDataLanguage() == 2)
servername = "Mercury23333 OCG/TCG Pre-release"; servername = "Mercury23333 OCG/TCG Pre-release";
AddServer(getActivity(), servername, "s1.ygo233.com", 23333, "Knight of Hanoi"); AddServer(getActivity(), servername, "s1.ygo233.com", 23333, "Knight of Hanoi");
//changeDownloadButton();在下载完成后,通过EventBus通知下载完成(加入用户点击下载后临时切出本fragment,又在下载完成后切回,通过eventbus能保证按钮样式正确更新 //changeDownloadButton();在下载完成后,通过EventBus通知下载完成(加入用户点击下载后临时切出本fragment,又在下载完成后切回,通过eventbus能保证按钮样式正确更新
/* 注意,要先更新版本号 */ /* 注意,要先更新版本号 */
SharedPreferenceUtil.setExpansionDataVer(ServerUtil.serverExCardVersion); SharedPreferenceUtil.setExpansionDataVer(ServerUtil.serverExCardVersion);
ServerUtil.exCardState = ServerUtil.ExCardState.UPDATED; ServerUtil.exCardState = ServerUtil.ExCardState.UPDATED;
EventBus.getDefault().postSticky(new ExCardEvent(ExCardEvent.EventType.exCardPackageChange));//安装后,通知UI做更新 EventBus.getDefault().postSticky(new ExCardEvent(ExCardEvent.EventType.exCardPackageChange));//安装后,通知UI做更新
DataManager.get().load(true); DataManager.get().load(true);
...@@ -194,8 +194,8 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener ...@@ -194,8 +194,8 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener
LogUtil.i("webCrawler", "Ex-card package is installed"); LogUtil.i("webCrawler", "Ex-card package is installed");
/* 如果未开启先行卡设置,则跳转到设置页面 */ /* 如果未开启先行卡设置,则跳转到设置页面 */
if (!AppsSettings.get().isReadExpansions()) {//解压完毕,但此时 if (!AppsSettings.get().isReadExpansions()) {//解压完毕,但此时
LogUtil.i("webCrawler", "Ex-card setting is not opened"); LogUtil.i("webCrawler", "Ex-card setting is not opened");
Intent startSetting = new Intent(context, MainActivity.class); Intent startSetting = new Intent(context, MainActivity.class);
startSetting.putExtra("flag", 4); startSetting.putExtra("flag", 4);
...@@ -213,7 +213,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener ...@@ -213,7 +213,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener
// String oldVer = SharedPreferenceUtil.getExpansionDataVer(); // String oldVer = SharedPreferenceUtil.getExpansionDataVer();
// if (!TextUtils.isEmpty(WebActivity.exCardVer)) { // if (!TextUtils.isEmpty(WebActivity.exCardVer)) {
// if (!WebActivity.exCardVer.equals(oldVer)) { // if (!WebActivity.exCardVer.equals(oldVer)) {
// //btn_download展示默认视图 // //btn_download展示默认视图
// } else { // } else {
// btnDownload.setText(R.string.tip_redownload); // btnDownload.setText(R.string.tip_redownload);
// } // }
...@@ -234,7 +234,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener ...@@ -234,7 +234,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener
} }
} }
private void downloadfromWeb(String fileUrl) { private void downloadfromWeb(String fileUrl) {
textDownload.setText("0%");//点击下载后,距离onDownloading触发要等几秒,这一延迟会造成软件响应慢的错觉,因此在下载函数开始就设置文本 textDownload.setText("0%");//点击下载后,距离onDownloading触发要等几秒,这一延迟会造成软件响应慢的错觉,因此在下载函数开始就设置文本
File file = new File(AppsSettings.get().getResourcePath() + "-preRlease.zip"); File file = new File(AppsSettings.get().getResourcePath() + "-preRlease.zip");
if (file.exists()) { if (file.exists()) {
FileUtils.deleteFile(file); FileUtils.deleteFile(file);
...@@ -256,7 +256,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener ...@@ -256,7 +256,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener
} catch (Exception e) { } catch (Exception e) {
message.what = UnzipUtils.ZIP_UNZIP_EXCEPTION; message.what = UnzipUtils.ZIP_UNZIP_EXCEPTION;
} finally { } finally {
message.what = UnzipUtils.ZIP_UNZIP_OK;//TODO 不对吧,finally是一定执行,这样即使有exception也会发unzip_ok啊 message.what = UnzipUtils.ZIP_UNZIP_OK;//TODO 不对吧,finally是一定执行,这样即使有exception也会发unzip_ok啊
} }
handler.sendMessage(message); handler.sendMessage(message);
} }
...@@ -272,7 +272,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener ...@@ -272,7 +272,7 @@ public class ExCardListFragment extends Fragment implements View.OnClickListener
@Override @Override
public void onDownloadFailed(Exception e) { public void onDownloadFailed(Exception e) {
//下载失败后删除下载的文件 //下载失败后删除下载的文件
FileUtils.deleteFile(file); FileUtils.deleteFile(file);
Message message = new Message(); Message message = new Message();
message.what = TYPE_DOWNLOAD_EXCEPTION; message.what = TYPE_DOWNLOAD_EXCEPTION;
......
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