Merge branch 'developer' into yxb_dev

姚旭斌
2 parents aa386a0f a5bec9bb
Showing 2 changed files with 3 additions and 2 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
@@ -83,7 +83,6 @@ public class CePingFragment extends BaseMVPCompatFragment&lt;CepingContract.CePingP
         textAndImg_zxlx.setImgs(R.drawable.zxlx, R.drawable.zxlx);
         textAndImg_zxlx.setOnClickListener(this);
         textAndImg_zxlx.setSelect(true);
-
         initListeners(view);
         floatingActionButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -13,6 +13,7 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.share.mvpsdk.utils.DisplayUtils;
+import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.R;
@@ -82,10 +83,11 @@ public class TextAndImgShowView extends LinearLayout {
     public void setWidth(Activity activity, View layout_control) {
         LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
         params.width = (DisplayUtils.getScreenWidthPixels(activity) -
-                DisplayUtils.dp2px(layout_control.getPaddingLeft() + layout_control.getPaddingRight()
+                DisplayUtils.dp2px(layout_control.getPaddingLeft() + layout_control.getPaddingRight()+20
                 )) / 4;
         layout.setLayoutParams(params);
         LayoutParams params1 = new LayoutParams(DisplayUtils.px2dp(110), DisplayUtils.px2dp(110));
+        ToastUtils.showToast(DisplayUtils.px2dp(110)+"");
         image.setLayoutParams(params1);
     }
 }