Skip to content

Y
YGOMobile
Commit 3c687d4e authored by fallenstardust's avatar fallenstardust
Browse files
Options

更新语言提示文字

parent e1f15d9a
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 23 deletions
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
View file @ 3c687d4e
......@@ -112,7 +112,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
//trpay
TrPay.getInstance(HomeActivity.this).initPaySdk("e1014da420ea4405898c01273d6731b6", "YGOMobile");
//autoupadte checking
checkPgyerUpdateSilent(getContext(),false,false,false);
checkPgyerUpdateSilent(getContext(), false, false, false);
//ServiceDuelAssistant
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
this.startForegroundService(new Intent(this, ServiceDuelAssistant.class));
......@@ -401,18 +401,18 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
}
/*
*isToastCheckUpdateing 是否提示正在检查更新
*isToastNoUpdata 没有更新是否提示
* isErrorIntent 检查更新失败是否跳转下载地址
*isToastCheckUpdateing 是否提示正在检查更新
*isToastNoUpdata 没有更新是否提示
* isErrorIntent 检查更新失败是否跳转下载地址
*/
public static void checkPgyerUpdateSilent(Context context,boolean isToastCheckUpdateing,boolean isToastNoUpdata,boolean isErrorIntent) {
final DialogPlus builder = new DialogPlus(context);
if (isToastCheckUpdateing) {
builder.showProgressBar();
builder.hideTitleBar();
builder.setMessage("检查更新中，请稍等");
builder.show();
}
public static void checkPgyerUpdateSilent(Context context, boolean isToastCheckUpdateing, boolean isToastNoUpdata, boolean isErrorIntent) {
final DialogPlus builder = new DialogPlus(context);
if (isToastCheckUpdateing) {
builder.showProgressBar();
builder.hideTitleBar();
builder.setMessage(R.string.Checking_Update);
builder.show();
}
//蒲公英自动检查更新
new PgyUpdateManager.Builder()
.setForced(true)
......@@ -421,14 +421,15 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
.setUpdateManagerListener(new UpdateManagerListener() {
@Override
public void onNoUpdateAvailable() {
if (isToastNoUpdata){
if (isToastNoUpdata) {
builder.dismiss();
Toast.makeText(context, R.string.Already_Lastest, Toast.LENGTH_SHORT).show();
}
}
@Override
public void onUpdateAvailable(AppBean appBean) {
final String versionName,updateMessage;
final String versionName, updateMessage;
versionName = appBean.getVersionName();
updateMessage = appBean.getReleaseNote();
builder.hideProgressBar();
......@@ -451,23 +452,24 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
if (isErrorIntent) {
builder.hideProgressBar();
builder.showTitleBar();
builder.setTitleText("检查更新失败");
builder.setMessage("检查更新失败，原因为：“"+e.getMessage()+"”\n是否跳转到官方下载地址下载？");
builder.setLeftButtonText("去吧");
builder.setRightButtonText("取消");
builder.setTitle(context.getResources().getString(R.string.Checking_Update_Failed));
builder.setMessage(e.getMessage()
+ context.getResources().getString(R.string.Ask_to_Change_Other_Way));
builder.setLeftButtonText(R.string.Cancel);
builder.setRightButtonText(R.string.OK);
builder.setRightButtonListener(new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
intent.setData(Uri.parse("https://www.taptap.com/app/37972"));
context.startActivity(intent);
dialog.dismiss();
}
});
builder.setLeftButtonListener(new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
intent.setData(Uri.parse("https://www.taptap.com/app/37972"));
context.startActivity(intent);
dialog.dismiss();
}
});
......@@ -490,7 +492,8 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
@Override
public void onProgressUpdate(Integer... integers) {
builder.getProgressBar2().setProgress(integers[0]);
}})
}
})
.register();
}
......
mobile/src/main/res/values-ko/strings.xml
View file @ 3c687d4e
......@@ -225,4 +225,9 @@
<string name="Download">다운로드</string>
<string name="Downloading">다운로드 중입니다. 잠시 기다려 주십시오.</string>
<string name="Update_Found">새로운 버전</string>
<string name="OK">확인</string>
<string name="Cancel">취소</string>
<string name="Checking_Update">업데이트 확인중</string>
<string name="Checking_Update_Failed">업데이트 확인 실패</string>
<string name="Ask_to_Change_Other_Way">\, 다른 방법으로 변경을 원하십니까</string>
</resources>
mobile/src/main/res/values-zh/strings.xml
View file @ 3c687d4e
......@@ -225,4 +225,9 @@
<string name="Download">下载</string>
<string name="Downloading">下载中，请稍候</string>
<string name="Update_Found">发现新版本</string>
<string name="OK">确定</string>
<string name="Cancel">取消</string>
<string name="Checking_Update">检查更新中，请稍候</string>
<string name="Checking_Update_Failed">检查更新失败</string>
<string name="Ask_to_Change_Other_Way">，是否跳转到备用下载方式？</string>
</resources>
mobile/src/main/res/values/strings.xml
View file @ 3c687d4e
......@@ -228,4 +228,9 @@
<string name="Download">Download</string>
<string name="Downloading">Now Downloading</string>
<string name="Update_Found">Found New Version</string>
<string name="OK">OK</string>
<string name="Cancel">Cancel</string>
<string name="Checking_Update">Now Checking Update</string>
<string name="Checking_Update_Failed">Checking Update Failed</string>
<string name="Ask_to_Change_Other_Way">\, would you like to change other way</string>
</resources>
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