陶汉栋 / ParentWork

Download as
Browse Code »

Commit 384118a2ec1b7dbfbf4c735efc81af89c1433a86

Authored by 姚旭斌
2 parents aa386a0f a5bec9bb
Exists in yxb_dev and in 2 other branches developer, wwx

Merge branch 'developer' into yxb_dev

Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
  Diff comments   View file @384118a
... ... @@ -83,7 +83,6 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP
83 83 textAndImg_zxlx.setImgs(R.drawable.zxlx, R.drawable.zxlx);
84 84 textAndImg_zxlx.setOnClickListener(this);
85 85 textAndImg_zxlx.setSelect(true);
86   -
87 86 initListeners(view);
88 87 floatingActionButton.setOnClickListener(new View.OnClickListener() {
89 88 @Override
... ...
app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
  Diff comments   View file @384118a
... ... @@ -13,6 +13,7 @@ import android.widget.TextView;
13 13  
14 14 import com.bumptech.glide.Glide;
15 15 import com.share.mvpsdk.utils.DisplayUtils;
  16 +import com.share.mvpsdk.utils.ToastUtils;
16 17 import com.shunzhi.parent.AppConfig;
17 18 import com.shunzhi.parent.R;
18 19  
... ... @@ -82,10 +83,11 @@ public class TextAndImgShowView extends LinearLayout {
82 83 public void setWidth(Activity activity, View layout_control) {
83 84 LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
84 85 params.width = (DisplayUtils.getScreenWidthPixels(activity) -
85   - DisplayUtils.dp2px(layout_control.getPaddingLeft() + layout_control.getPaddingRight()
  86 + DisplayUtils.dp2px(layout_control.getPaddingLeft() + layout_control.getPaddingRight()+20
86 87 )) / 4;
87 88 layout.setLayoutParams(params);
88 89 LayoutParams params1 = new LayoutParams(DisplayUtils.px2dp(110), DisplayUtils.px2dp(110));
  90 + ToastUtils.showToast(DisplayUtils.px2dp(110)+"");
89 91 image.setLayoutParams(params1);
90 92 }
91 93 }
... ...