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

Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3

Browse Source 
Conflicts:
	app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java
This commit is contained in:
huangzhuanghua
2017-01-20 17:14:07 +08:00
parent b2d568d646 22c2b47506
commit c045d4e2cc
25 changed files with 168 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/gh/common/util/DialogUtils.java
View File

@ -11,6 +11,7 @@ import android.text.Spanned;
import android.view.View;
import android.view.Window;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.gh.gamecenter.R;
@ -99,10 +100,10 @@ public class DialogUtils {
// 标题
TextView alertdialog_title = (TextView) view.findViewById(R.id.installhint_title);
alertdialog_title.setText("重要提示");
Spanned content = Html.fromHtml("如果您使用的是"+ "<font color=\"#ff0000\">华为</font>" +"手机或"+
Spanned content = Html.fromHtml("如果您使用的是"+ "<font color=\"#ff0000\">华为</font>" +"或"+
"<font color=\"#ff0000\">OPPO</font>" +"手机，安装游戏时请选择“" +
"<font color=\"#ff0000\">继续安装</font>" +
"”（请记住不要选择“官方推荐”或“软件商店安装”）");
"”（记住不要选择“官方推荐”或“软件商店安装”）");
// 内容
TextView alertdialog_content = (TextView) view.findViewById(R.id.installhint_content);
alertdialog_content.setText(content);
@ -115,8 +116,9 @@ public class DialogUtils {
final ImageView installhint_select = (ImageView) view.findViewById(R.id.installhint_select);
TextView installhint_cancel = (TextView) view.findViewById(R.id.installhint_cancel);
LinearLayout installhint_unselect_ll = (LinearLayout) view.findViewById(R.id.installhint_unselect_ll);
installhint_cancel.setOnClickListener(new View.OnClickListener() {
installhint_unselect_ll.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (installhint_unselect.getVisibility() == View.GONE) {