Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.50' into 1.50

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/NewsActivity.java
This commit is contained in:
khy
2016-07-11 17:29:00 +08:00
parent fa6cc8dfaf 3c83b4ad5c
commit 848b4e44d5
39 changed files with 3751 additions and 2539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/src/main/java/com/gh/gamecenter/SettingActivity.java
View File

@ -243,7 +243,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
case R.id.setting_tv_disclaimer:
String content = sp.getString("disclaimer", null);
if (!TextUtils.isEmpty(content)) {
showDisclaimerDialog(content);
DialogUtils.showDisclaimerDialog(this, content);
}
break;
case R.id.setting_rl_font_size:
@ -349,30 +349,6 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
}
}
// 弹出免责声明的窗口
private void showDisclaimerDialog(String content) {
final Dialog disclaimerDialog = new Dialog(this);
View view = View
.inflate(this, R.layout.setting_disclaimer_dialog, null);
TextView title = (TextView) view
.findViewById(R.id.disclaimer_dialog_title);
title.setText("免责声明");
TextView message = (TextView) view
.findViewById(R.id.disclaimer_dialog_message);
Spanned spanned = Html.fromHtml(content);
message.setText(spanned);
view.findViewById(R.id.disclaimer_dialog_confirm).setOnClickListener(
new OnClickListener() {
@Override
public void onClick(View v) {
disclaimerDialog.dismiss();
}
});
disclaimerDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
disclaimerDialog.setContentView(view);
disclaimerDialog.show();
}
private void checkUpdate() {
String TD_CHANNEL_ID = (String) PackageUtils.getMetaData(this,
getPackageName(), "TD_CHANNEL_ID");
@ -418,7 +394,7 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
showUpdateDialog(updateMD5);
} else {
showCancelDialog();
toast("已是最新版本");
}
}
@ -572,39 +548,6 @@ public class SettingActivity extends BaseActivity implements OnClickListener {
DownloadManager.getInstance(getApplicationContext()).add(downloadEntry);
}
private void showCancelDialog() {
final Dialog dialog = new Dialog(SettingActivity.this);
View view = View.inflate(SettingActivity.this,
R.layout.search_history_delete_dialog, null);
TextView title = (TextView) view.findViewById(R.id.delete_dialog_title);
title.setText("更新提示");
TextView content = (TextView) view
.findViewById(R.id.delete_dialog_message);
content.setText("已经是最新版本！");
view.findViewById(R.id.delete_dialog_rl_cancel)
.setVisibility(View.GONE);
view.findViewById(R.id.delete_dialog_rl_confirm).setVisibility(
View.VISIBLE);
TextView cancel = (TextView) view
.findViewById(R.id.delete_dialog_confirm);
cancel.setVisibility(View.VISIBLE);
cancel.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
dialog.dismiss();
}
});
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setContentView(view);
dialog.show();
}
@Override
public void onResume() {
super.onResume();