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

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

Browse Source 
Conflicts:
	app/src/main/java/com/gh/common/util/ImageUtils.java
	app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java
	app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java
	app/src/main/java/com/gh/gamecenter/game/GameListAdapter.java
	app/src/main/java/com/gh/gamecenter/game/NewGame2FragmentAdapter.java
	app/src/main/java/com/gh/gamecenter/gamedetails/GameDetailsFragment.java
	app/src/main/java/com/gh/gamecenter/gamedetails/GameInformationFragment.java
	app/src/main/java/com/gh/gamecenter/gamedetails/GameStrategyFragment.java
	app/src/main/res/drawable/border_white_bg.xml
	app/src/main/res/layout/game_news_type_list_item.xml
	app/src/main/res/layout/home_consolegame_item.xml
	app/src/main/res/layout/home_game_test_item.xml
This commit is contained in:
huangzhuanghua
2016-08-31 14:46:50 +08:00
parent efc19441cd 803ec482fb
commit a270946ce2
44 changed files with 2293 additions and 5591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/com/gh/common/view/DownloadDialog.java
View File

@ -135,6 +135,7 @@ public class DownloadDialog {
private TextView download_percentage;
private LinearLayout linearLayout;
private ViewPager viewPager;
private LinearLayout llCollection;
private int row;
private int column;
@ -198,8 +199,22 @@ public class DownloadDialog {
TextView textView = (TextView) contentView.findViewById(R.id.dialog_title);
textView.setText(gameName);
int size = game.getApk().size();
int vpHeight = 0;
if (size<=3){
vpHeight = 72;
}else if (size<=6){
vpHeight = 136;
}else {
vpHeight = 200;
}
linearLayout = (LinearLayout) contentView.findViewById(R.id.dialog_ll_hint);
viewPager = (ViewPager) contentView.findViewById(R.id.dialog_viewPager);
llCollection = (LinearLayout) contentView.findViewById(R.id.dialog_collection);
ViewGroup.LayoutParams layoutParams = viewPager.getLayoutParams();
layoutParams.height = DisplayUtils.dip2px(context,vpHeight);
viewPager.setLayoutParams(layoutParams);
isLoadPlatform = false;
@ -571,6 +586,7 @@ public class DownloadDialog {
viewHolder.itemView.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
llCollection.setVisibility(View.VISIBLE);
if (viewHolder.download_item_tv_status.getVisibility() == View.GONE) {
//下载游戏
addDownloadEntry(apkEntity, viewHolder.download_item_tv_status);