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

fix conflict

Browse Source
This commit is contained in:
CsHeng
2017-06-27 16:28:33 +08:00
parent 496144f8ad 4cbee71636
commit 8101d394a8
15 changed files with 214 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/gh/gamecenter/ViewImageActivity.java
View File

@ -58,10 +58,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 查看游戏截图页面
*
@ -70,10 +68,8 @@ import butterknife.ButterKnife;
//TODO 处理这里activity到统一主题
public class ViewImageActivity extends Activity implements OnPageChangeListener {
@BindView(R.id.viewimage_vp_show)
Gh_ViewPager mViewimageVp;
@BindView(R.id.viewimage_slide_line)
View mViewimageLine;
private Gh_ViewPager mViewimageVp;
private View mViewimageLine;
private ViewImageAdapter adapter;
private RelativeLayout.LayoutParams rparams;
@ -158,6 +154,9 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener
//TODO activity 没继承base之前，可是木有ButterKnife的。。。。
ButterKnife.bind(this);
mViewimageVp = (Gh_ViewPager) findViewById(R.id.viewimage_vp_show);
mViewimageLine = findViewById(R.id.viewimage_slide_line);
imagePipeline = Fresco.getImagePipeline();
DisplayMetrics outMetrics = new DisplayMetrics();
@ -169,7 +168,7 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener
rparams.bottomMargin = DisplayUtils.dip2px(getApplicationContext(), 10);
rparams.leftMargin = width * current;
mViewimageLine.setLayoutParams(rparams);
adapter = new ViewImageAdapter();
mViewimageVp.setAdapter(adapter);
mViewimageVp.setCurrentItem(current);