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/base/GHPushMessageReceiver.java
	app/src/main/java/com/gh/base/GHUmengNotificationClickHandler.java
	app/src/main/java/com/gh/common/util/PostCommentUtils.java
	app/src/main/java/com/gh/gamecenter/MainActivity.java
	app/src/main/res/layout/fragment_personal.xml
	app/src/main/res/layout/game_test_item.xml
This commit is contained in:
huangzhuanghua
2017-01-04 16:26:10 +08:00
parent 659d6fc263 d56fa926d2
commit 1e077a7b0c
50 changed files with 855 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/gh/common/util/LibaoUtils.java
View File

@ -4,6 +4,7 @@ import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.View;
@ -235,14 +236,26 @@ public class LibaoUtils {
libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up);
break;
case "linged":
int[][] states = new int[2][];
states[0] = new int[] { android.R.attr.state_pressed };
states[1] = new int[] {};
int[] colors = new int[] { Color.WHITE,
Color.parseColor("#06D0A8") };
ColorStateList sl = new ColorStateList(states, colors);
libaoBtn.setText("已领取");
libaoBtn.setBackgroundResource(R.drawable.libao_linged_bg);
libaoBtn.setTextColor(Color.parseColor("#06D0A8"));
libaoBtn.setBackgroundResource(R.drawable.libao_linged_style);
libaoBtn.setTextColor(sl);
break;
case "taoed":
int[][] states2 = new int[2][];
states2[0] = new int[] { android.R.attr.state_pressed };
states2[1] = new int[] {};
int[] colors2 = new int[] { Color.WHITE,
Color.parseColor("#ffb13c") };
ColorStateList sl2 = new ColorStateList(states2, colors2);
libaoBtn.setText("已淘号");
libaoBtn.setBackgroundResource(R.drawable.libao_taoed_bg);
libaoBtn.setTextColor(Color.parseColor("#ffb13c"));
libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style);
libaoBtn.setTextColor(sl2);
break;
case "copy":
libaoBtn.setText("复制");
@ -308,7 +321,9 @@ public class LibaoUtils {
}
libaoEntity.setAvailable(libaoEntity.getAvailable() - 1);
libaoDao.add(LibaoInfo.createLibaoInfo(libaoEntity));
LibaoInfo libaoInfo = LibaoInfo.createLibaoInfo(libaoEntity);
libaoInfo.setCode(libaoCode);
libaoDao.add(libaoInfo);
EventBus.getDefault().post(new EBReuse("libaoChanged"));
@ -398,7 +413,9 @@ public class LibaoUtils {
Utils.toast(libaoBtn.getContext(), "淘号成功");
libaoDao.add(LibaoInfo.createLibaoInfo(libaoEntity));
LibaoInfo libaoInfo = LibaoInfo.createLibaoInfo(libaoEntity);
libaoInfo.setCode(libaoCode);
libaoDao.add(libaoInfo);
EventBus.getDefault().post(new EBReuse("libaoChanged"));