Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev

This commit is contained in:
张玉久
2020-07-27 15:19:09 +08:00

View File

@ -20,7 +20,6 @@ import androidx.core.content.ContextCompat;
import androidx.databinding.BindingAdapter;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
import com.facebook.drawee.generic.RoundingParams;
import com.facebook.drawee.view.SimpleDraweeView;
import com.gh.base.OnViewClickListener;
@ -327,13 +326,10 @@ public class BindingAdapters {
@BindingAdapter("cornerRadius")
public static void setCornerRadius(View view, int valueInDp) {
if (view instanceof GameIconView) {
RoundingParams roundingParams = RoundingParams.fromCornersRadius(valueInDp);
((GameIconView) view).getIconIv().setHierarchy(new GenericDraweeHierarchyBuilder(view.getResources())
.setRoundingParams(roundingParams)
.build());
((GameIconView) view).getIconDecoratorIv().setHierarchy(new GenericDraweeHierarchyBuilder(view.getResources())
.setRoundingParams(roundingParams)
.build());
RoundingParams roundingParams = RoundingParams.fromCornersRadius(DisplayUtils.dip2px(valueInDp));
((GameIconView) view).getIconIv().getHierarchy().setRoundingParams(roundingParams);
((GameIconView) view).getIconDecoratorIv().getHierarchy().setRoundingParams(roundingParams);
}
}