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

Merge branch '3.0' of gitlab.ghzhushou.com:halo/assistant-android into 3.0

Browse Source
This commit is contained in:
CsHeng
2017-07-10 15:01:39 +08:00
parent 10b1380aad b239407c25
commit 979ee209dd
192 changed files with 3118 additions and 5157 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

@ -16,11 +16,10 @@ import android.widget.LinearLayout.LayoutParams;
import android.widget.PopupWindow;
import android.widget.TextView;
import com.gh.download.DownloadManager;
import com.gh.common.util.DisplayUtils;
import com.gh.common.util.PackageUtils;
import com.gh.common.util.PlatformUtils;
import com.lightgame.utils.Utils;
import com.gh.download.DownloadManager;
import com.gh.gamecenter.R;
import com.gh.gamecenter.adapter.OnCollectionCallBackListener;
import com.gh.gamecenter.adapter.PlatformPagerAdapter;
@ -34,6 +33,7 @@ import com.gh.gamecenter.manager.PackageManager;
import com.lightgame.download.DataWatcher;
import com.lightgame.download.DownloadEntity;
import com.lightgame.download.DownloadStatus;
import com.lightgame.utils.Utils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@ -334,11 +334,11 @@ public class DownloadDialog implements OnCollectionCallBackListener {
int count = apkList.size();
int vpHeight;
if (count <= 3) {
vpHeight = 88;
vpHeight = 90;
} else if (count <= 6) {
vpHeight = 148;
vpHeight = 150;
} else {
vpHeight = 208;
vpHeight = 210;
}
ViewGroup.LayoutParams layoutParams = viewPager.getLayoutParams();
layoutParams.height = DisplayUtils.dip2px(mContext, vpHeight);
@ -421,11 +421,11 @@ public class DownloadDialog implements OnCollectionCallBackListener {
int count = gameCollectionEntity.getSaveApkEntity().size();
int vpHeight;
if (count <= 3) {
vpHeight = 80;
vpHeight = 82;
} else if (count <= 6) {
vpHeight = 140;
vpHeight = 142;
} else {
vpHeight = 200;
vpHeight = 202;
}
ViewGroup.LayoutParams layoutParams = collectionViewPager.getLayoutParams();