userLuckyBagGiftWall) {
+ this.userLuckyBagGiftWall = userLuckyBagGiftWall;
+ }
+
public static class UserLevelVoBean {
/**
* experAmount : 1647
@@ -225,8 +253,8 @@ public class UserDetailInfo implements Serializable {
* charmLevelSeq : 2
*/
- private int experAmount;
- private int charmAmount;
+ private long experAmount;
+ private long charmAmount;
private String experUrl;
private String charmUrl;
private String experLevelName;
@@ -236,19 +264,19 @@ public class UserDetailInfo implements Serializable {
private int experLevelSeq;
private int charmLevelSeq;
- public int getExperAmount() {
+ public long getExperAmount() {
return experAmount;
}
- public void setExperAmount(int experAmount) {
+ public void setExperAmount(long experAmount) {
this.experAmount = experAmount;
}
- public int getCharmAmount() {
+ public long getCharmAmount() {
return charmAmount;
}
- public void setCharmAmount(int charmAmount) {
+ public void setCharmAmount(long charmAmount) {
this.charmAmount = charmAmount;
}
@@ -394,8 +422,6 @@ public class UserDetailInfo implements Serializable {
}
}
-
-
public static class PrivatePhotoBean {
/**
* photoUrl : https://image.zhongjialx.com/rotate_picture_1587010848888.jpg?imageslim
@@ -430,5 +456,33 @@ public class UserDetailInfo implements Serializable {
isReview = review;
}
}
+
+ public static class RelationUserVO {
+
+ public int cpLevel;
+ public int cpDay;
+ public String cpAvatar;
+ public String cpNick;
+ public long cpUid;
+ public long currentExp;
+ public long nextLevelExp;
+ public String avatar;
+ public String nick;
+ public long startExp;
+ public long endExp;
+
+ public Boolean showCpAvatar;
+ public Boolean showCpAnim;
+ public long cancelGoldNum = 0L;
+
+ }
+
+ public static class GuildInfo{
+ public long erbanNo;
+ public long guildId;
+ public String avatar;
+ public String guildName;
+
+ }
}
}
diff --git a/core/src/main/java/com/chwl/core/utils/SpanUtils.java b/core/src/main/java/com/chwl/core/utils/SpanUtils.java
new file mode 100644
index 000000000..e9cd2e9ab
--- /dev/null
+++ b/core/src/main/java/com/chwl/core/utils/SpanUtils.java
@@ -0,0 +1,1459 @@
+package com.chwl.core.utils;
+
+import android.annotation.SuppressLint;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.BlurMaskFilter;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.Rect;
+import android.graphics.Shader;
+import android.graphics.Typeface;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.text.Layout;
+import android.text.Layout.Alignment;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextPaint;
+import android.text.method.LinkMovementMethod;
+import android.text.style.AbsoluteSizeSpan;
+import android.text.style.AlignmentSpan;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.CharacterStyle;
+import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.LeadingMarginSpan;
+import android.text.style.LineHeightSpan;
+import android.text.style.MaskFilterSpan;
+import android.text.style.RelativeSizeSpan;
+import android.text.style.ReplacementSpan;
+import android.text.style.ScaleXSpan;
+import android.text.style.StrikethroughSpan;
+import android.text.style.StyleSpan;
+import android.text.style.SubscriptSpan;
+import android.text.style.SuperscriptSpan;
+import android.text.style.TypefaceSpan;
+import android.text.style.URLSpan;
+import android.text.style.UnderlineSpan;
+import android.text.style.UpdateAppearance;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.FloatRange;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
+import static android.graphics.BlurMaskFilter.Blur;
+
+import com.example.lib_utils.AppUtils;
+
+import java.io.InputStream;
+import java.io.Serializable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.ref.WeakReference;
+
+public class SpanUtils {
+
+ private static final int COLOR_DEFAULT = 0xFEFFFFFF;
+
+ public static final int ALIGN_BOTTOM = 0;
+ public static final int ALIGN_BASELINE = 1;
+ public static final int ALIGN_CENTER = 2;
+ public static final int ALIGN_TOP = 3;
+
+ @IntDef({ALIGN_BOTTOM, ALIGN_BASELINE, ALIGN_CENTER, ALIGN_TOP})
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface Align {
+ }
+
+ private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+
+ public static SpanUtils with(final TextView textView) {
+ return new SpanUtils(textView);
+ }
+
+ private TextView mTextView;
+ private CharSequence mText;
+ private int flag;
+ private int foregroundColor;
+ private int backgroundColor;
+ private int lineHeight;
+ private int alignLine;
+ private int quoteColor;
+ private int stripeWidth;
+ private int quoteGapWidth;
+ private int first;
+ private int rest;
+ private int bulletColor;
+ private int bulletRadius;
+ private int bulletGapWidth;
+ private int fontSize;
+ private float proportion;
+ private float xProportion;
+ private boolean isStrikethrough;
+ private boolean isUnderline;
+ private boolean isSuperscript;
+ private boolean isSubscript;
+ private boolean isBold;
+ private boolean isItalic;
+ private boolean isBoldItalic;
+ private String fontFamily;
+ private Typeface typeface;
+ private Alignment alignment;
+ private int verticalAlign;
+ private ClickableSpan clickSpan;
+ private String url;
+ private float blurRadius;
+ private Blur style;
+ private Shader shader;
+ private float shadowRadius;
+ private float shadowDx;
+ private float shadowDy;
+ private int shadowColor;
+ private Object[] spans;
+
+ private Bitmap imageBitmap;
+ private Drawable imageDrawable;
+ private Uri imageUri;
+ private int imageResourceId;
+ private int alignImage;
+
+ private int spaceSize;
+ private int spaceColor;
+
+ private SerializableSpannableStringBuilder mBuilder;
+ private boolean isCreated;
+
+ private int mType;
+ private final int mTypeCharSequence = 0;
+ private final int mTypeImage = 1;
+ private final int mTypeSpace = 2;
+
+ private SpanUtils(TextView textView) {
+ this();
+ mTextView = textView;
+ }
+
+ public SpanUtils() {
+ mBuilder = new SerializableSpannableStringBuilder();
+ mText = "";
+ mType = -1;
+ setDefault();
+ }
+
+ private void setDefault() {
+ flag = Spanned.SPAN_EXCLUSIVE_EXCLUSIVE;
+ foregroundColor = COLOR_DEFAULT;
+ backgroundColor = COLOR_DEFAULT;
+ lineHeight = -1;
+ quoteColor = COLOR_DEFAULT;
+ first = -1;
+ bulletColor = COLOR_DEFAULT;
+ fontSize = -1;
+ proportion = -1;
+ xProportion = -1;
+ isStrikethrough = false;
+ isUnderline = false;
+ isSuperscript = false;
+ isSubscript = false;
+ isBold = false;
+ isItalic = false;
+ isBoldItalic = false;
+ fontFamily = null;
+ typeface = null;
+ alignment = null;
+ verticalAlign = -1;
+ clickSpan = null;
+ url = null;
+ blurRadius = -1;
+ shader = null;
+ shadowRadius = -1;
+ spans = null;
+
+ imageBitmap = null;
+ imageDrawable = null;
+ imageUri = null;
+ imageResourceId = -1;
+
+ spaceSize = -1;
+ }
+
+ /**
+ * Set the span of flag.
+ *
+ * @param flag The flag.
+ *
+ * - {@link Spanned#SPAN_INCLUSIVE_EXCLUSIVE}
+ * - {@link Spanned#SPAN_INCLUSIVE_INCLUSIVE}
+ * - {@link Spanned#SPAN_EXCLUSIVE_EXCLUSIVE}
+ * - {@link Spanned#SPAN_EXCLUSIVE_INCLUSIVE}
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setFlag(final int flag) {
+ this.flag = flag;
+ return this;
+ }
+
+ /**
+ * Set the span of foreground's color.
+ *
+ * @param color The color of foreground
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setForegroundColor(@ColorInt final int color) {
+ this.foregroundColor = color;
+ return this;
+ }
+
+ /**
+ * Set the span of background's color.
+ *
+ * @param color The color of background
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setBackgroundColor(@ColorInt final int color) {
+ this.backgroundColor = color;
+ return this;
+ }
+
+ /**
+ * Set the span of line height.
+ *
+ * @param lineHeight The line height, in pixel.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setLineHeight(@IntRange(from = 0) final int lineHeight) {
+ return setLineHeight(lineHeight, ALIGN_CENTER);
+ }
+
+ /**
+ * Set the span of line height.
+ *
+ * @param lineHeight The line height, in pixel.
+ * @param align The alignment.
+ *
+ * - {@link Align#ALIGN_TOP }
+ * - {@link Align#ALIGN_CENTER}
+ * - {@link Align#ALIGN_BOTTOM}
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setLineHeight(@IntRange(from = 0) final int lineHeight,
+ @Align final int align) {
+ this.lineHeight = lineHeight;
+ this.alignLine = align;
+ return this;
+ }
+
+ /**
+ * Set the span of quote's color.
+ *
+ * @param color The color of quote
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setQuoteColor(@ColorInt final int color) {
+ return setQuoteColor(color, 2, 2);
+ }
+
+ /**
+ * Set the span of quote's color.
+ *
+ * @param color The color of quote.
+ * @param stripeWidth The width of stripe, in pixel.
+ * @param gapWidth The width of gap, in pixel.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setQuoteColor(@ColorInt final int color,
+ @IntRange(from = 1) final int stripeWidth,
+ @IntRange(from = 0) final int gapWidth) {
+ this.quoteColor = color;
+ this.stripeWidth = stripeWidth;
+ this.quoteGapWidth = gapWidth;
+ return this;
+ }
+
+ /**
+ * Set the span of leading margin.
+ *
+ * @param first The indent for the first line of the paragraph.
+ * @param rest The indent for the remaining lines of the paragraph.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setLeadingMargin(@IntRange(from = 0) final int first,
+ @IntRange(from = 0) final int rest) {
+ this.first = first;
+ this.rest = rest;
+ return this;
+ }
+
+ /**
+ * Set the span of bullet.
+ *
+ * @param gapWidth The width of gap, in pixel.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setBullet(@IntRange(from = 0) final int gapWidth) {
+ return setBullet(0, 3, gapWidth);
+ }
+
+ /**
+ * Set the span of bullet.
+ *
+ * @param color The color of bullet.
+ * @param radius The radius of bullet, in pixel.
+ * @param gapWidth The width of gap, in pixel.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setBullet(@ColorInt final int color,
+ @IntRange(from = 0) final int radius,
+ @IntRange(from = 0) final int gapWidth) {
+ this.bulletColor = color;
+ this.bulletRadius = radius;
+ this.bulletGapWidth = gapWidth;
+ return this;
+ }
+
+ /**
+ * Set the span of font's size.
+ *
+ * @param size The size of font.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setFontSize(@IntRange(from = 0) final int size) {
+ return setFontSize(size, false);
+ }
+
+ /**
+ * Set the span of size of font.
+ *
+ * @param size The size of font.
+ * @param isSp True to use sp, false to use pixel.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setFontSize(@IntRange(from = 0) final int size, final boolean isSp) {
+ if (isSp) {
+ final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
+ this.fontSize = (int) (size * fontScale + 0.5f);
+ } else {
+ this.fontSize = size;
+ }
+ return this;
+ }
+
+ /**
+ * Set the span of proportion of font.
+ *
+ * @param proportion The proportion of font.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setFontProportion(final float proportion) {
+ this.proportion = proportion;
+ return this;
+ }
+
+ /**
+ * Set the span of transverse proportion of font.
+ *
+ * @param proportion The transverse proportion of font.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setFontXProportion(final float proportion) {
+ this.xProportion = proportion;
+ return this;
+ }
+
+ /**
+ * Set the span of strikethrough.
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setStrikethrough() {
+ this.isStrikethrough = true;
+ return this;
+ }
+
+ /**
+ * Set the span of underline.
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setUnderline() {
+ this.isUnderline = true;
+ return this;
+ }
+
+ /**
+ * Set the span of superscript.
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setSuperscript() {
+ this.isSuperscript = true;
+ return this;
+ }
+
+ /**
+ * Set the span of subscript.
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setSubscript() {
+ this.isSubscript = true;
+ return this;
+ }
+
+ /**
+ * Set the span of bold.
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setBold() {
+ isBold = true;
+ return this;
+ }
+
+ /**
+ * Set the span of italic.
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setItalic() {
+ isItalic = true;
+ return this;
+ }
+
+ /**
+ * Set the span of bold italic.
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setBoldItalic() {
+ isBoldItalic = true;
+ return this;
+ }
+
+ /**
+ * Set the span of font family.
+ *
+ * @param fontFamily The font family.
+ *
+ * - monospace
+ * - serif
+ * - sans-serif
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setFontFamily(@NonNull final String fontFamily) {
+ this.fontFamily = fontFamily;
+ return this;
+ }
+
+ /**
+ * Set the span of typeface.
+ *
+ * @param typeface The typeface.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setTypeface(@NonNull final Typeface typeface) {
+ this.typeface = typeface;
+ return this;
+ }
+
+ /**
+ * Set the span of horizontal alignment.
+ *
+ * @param alignment The alignment.
+ *
+ * - {@link Alignment#ALIGN_NORMAL }
+ * - {@link Alignment#ALIGN_OPPOSITE}
+ * - {@link Alignment#ALIGN_CENTER }
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setHorizontalAlign(@NonNull final Alignment alignment) {
+ this.alignment = alignment;
+ return this;
+ }
+
+ /**
+ * Set the span of vertical alignment.
+ *
+ * @param align The alignment.
+ *
+ * - {@link Align#ALIGN_TOP }
+ * - {@link Align#ALIGN_CENTER }
+ * - {@link Align#ALIGN_BASELINE}
+ * - {@link Align#ALIGN_BOTTOM }
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setVerticalAlign(@Align final int align) {
+ this.verticalAlign = align;
+ return this;
+ }
+
+ /**
+ * Set the span of click.
+ * Must set {@code view.setMovementMethod(LinkMovementMethod.getInstance())}
+ *
+ * @param clickSpan The span of click.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setClickSpan(@NonNull final ClickableSpan clickSpan) {
+ setMovementMethodIfNeed();
+ this.clickSpan = clickSpan;
+ return this;
+ }
+
+ /**
+ * Set the span of click.
+ * Must set {@code view.setMovementMethod(LinkMovementMethod.getInstance())}
+ *
+ * @param color The color of click span.
+ * @param underlineText True to support underline, false otherwise.
+ * @param listener The listener of click span.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setClickSpan(@ColorInt final int color,
+ final boolean underlineText,
+ final View.OnClickListener listener) {
+ setMovementMethodIfNeed();
+ this.clickSpan = new ClickableSpan() {
+
+ @Override
+ public void updateDrawState(@NonNull TextPaint paint) {
+ paint.setColor(color);
+ paint.setUnderlineText(underlineText);
+ }
+
+ @Override
+ public void onClick(@NonNull View widget) {
+ if (listener != null) {
+ listener.onClick(widget);
+ }
+ }
+ };
+ return this;
+ }
+
+ /**
+ * Set the span of url.
+ * Must set {@code view.setMovementMethod(LinkMovementMethod.getInstance())}
+ *
+ * @param url The url.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setUrl(@NonNull final String url) {
+ setMovementMethodIfNeed();
+ this.url = url;
+ return this;
+ }
+
+ private void setMovementMethodIfNeed() {
+ if (mTextView != null && mTextView.getMovementMethod() == null) {
+ mTextView.setMovementMethod(LinkMovementMethod.getInstance());
+ }
+ }
+
+ /**
+ * Set the span of blur.
+ *
+ * @param radius The radius of blur.
+ * @param style The style.
+ *
+ * - {@link Blur#NORMAL}
+ * - {@link Blur#SOLID}
+ * - {@link Blur#OUTER}
+ * - {@link Blur#INNER}
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setBlur(@FloatRange(from = 0, fromInclusive = false) final float radius,
+ final Blur style) {
+ this.blurRadius = radius;
+ this.style = style;
+ return this;
+ }
+
+ /**
+ * Set the span of shader.
+ *
+ * @param shader The shader.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setShader(@NonNull final Shader shader) {
+ this.shader = shader;
+ return this;
+ }
+
+ /**
+ * Set the span of shadow.
+ *
+ * @param radius The radius of shadow.
+ * @param dx X-axis offset, in pixel.
+ * @param dy Y-axis offset, in pixel.
+ * @param shadowColor The color of shadow.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setShadow(@FloatRange(from = 0, fromInclusive = false) final float radius,
+ final float dx,
+ final float dy,
+ final int shadowColor) {
+ this.shadowRadius = radius;
+ this.shadowDx = dx;
+ this.shadowDy = dy;
+ this.shadowColor = shadowColor;
+ return this;
+ }
+
+
+ /**
+ * Set the spans.
+ *
+ * @param spans The spans.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils setSpans(@NonNull final Object... spans) {
+ if (spans.length > 0) {
+ this.spans = spans;
+ }
+ return this;
+ }
+
+ /**
+ * Append the text text.
+ *
+ * @param text The text.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils append(@NonNull final CharSequence text) {
+ apply(mTypeCharSequence);
+ mText = text;
+ return this;
+ }
+
+ /**
+ * Append one line.
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils appendLine() {
+ apply(mTypeCharSequence);
+ mText = LINE_SEPARATOR;
+ return this;
+ }
+
+ /**
+ * Append text and one line.
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils appendLine(@NonNull final CharSequence text) {
+ apply(mTypeCharSequence);
+ mText = text + LINE_SEPARATOR;
+ return this;
+ }
+
+ /**
+ * Append one image.
+ *
+ * @param bitmap The bitmap of image.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils appendImage(@NonNull final Bitmap bitmap) {
+ return appendImage(bitmap, ALIGN_BOTTOM);
+ }
+
+ /**
+ * Append one image.
+ *
+ * @param bitmap The bitmap.
+ * @param align The alignment.
+ *
+ * - {@link Align#ALIGN_TOP }
+ * - {@link Align#ALIGN_CENTER }
+ * - {@link Align#ALIGN_BASELINE}
+ * - {@link Align#ALIGN_BOTTOM }
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils appendImage(@NonNull final Bitmap bitmap, @Align final int align) {
+ apply(mTypeImage);
+ this.imageBitmap = bitmap;
+ this.alignImage = align;
+ return this;
+ }
+
+ /**
+ * Append one image.
+ *
+ * @param drawable The drawable of image.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils appendImage(@NonNull final Drawable drawable) {
+ return appendImage(drawable, ALIGN_BOTTOM);
+ }
+
+ /**
+ * Append one image.
+ *
+ * @param drawable The drawable of image.
+ * @param align The alignment.
+ *
+ * - {@link Align#ALIGN_TOP }
+ * - {@link Align#ALIGN_CENTER }
+ * - {@link Align#ALIGN_BASELINE}
+ * - {@link Align#ALIGN_BOTTOM }
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils appendImage(@NonNull final Drawable drawable, @Align final int align) {
+ apply(mTypeImage);
+ this.imageDrawable = drawable;
+ this.alignImage = align;
+ return this;
+ }
+
+ /**
+ * Append one image.
+ *
+ * @param uri The uri of image.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils appendImage(@NonNull final Uri uri) {
+ return appendImage(uri, ALIGN_BOTTOM);
+ }
+
+ /**
+ * Append one image.
+ *
+ * @param uri The uri of image.
+ * @param align The alignment.
+ *
+ * - {@link Align#ALIGN_TOP }
+ * - {@link Align#ALIGN_CENTER }
+ * - {@link Align#ALIGN_BASELINE}
+ * - {@link Align#ALIGN_BOTTOM }
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils appendImage(@NonNull final Uri uri, @Align final int align) {
+ apply(mTypeImage);
+ this.imageUri = uri;
+ this.alignImage = align;
+ return this;
+ }
+
+ /**
+ * Append one image.
+ *
+ * @param resourceId The resource id of image.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils appendImage(@DrawableRes final int resourceId) {
+ return appendImage(resourceId, ALIGN_BOTTOM);
+ }
+
+ /**
+ * Append one image.
+ *
+ * @param resourceId The resource id of image.
+ * @param align The alignment.
+ *
+ * - {@link Align#ALIGN_TOP }
+ * - {@link Align#ALIGN_CENTER }
+ * - {@link Align#ALIGN_BASELINE}
+ * - {@link Align#ALIGN_BOTTOM }
+ *
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils appendImage(@DrawableRes final int resourceId, @Align final int align) {
+ apply(mTypeImage);
+ this.imageResourceId = resourceId;
+ this.alignImage = align;
+ return this;
+ }
+
+ /**
+ * Append space.
+ *
+ * @param size The size of space.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils appendSpace(@IntRange(from = 0) final int size) {
+ return appendSpace(size, Color.TRANSPARENT);
+ }
+
+ /**
+ * Append space.
+ *
+ * @param size The size of space.
+ * @param color The color of space.
+ * @return the single {@link SpanUtils} instance
+ */
+ public SpanUtils appendSpace(@IntRange(from = 0) final int size, @ColorInt final int color) {
+ apply(mTypeSpace);
+ spaceSize = size;
+ spaceColor = color;
+ return this;
+ }
+
+ private void apply(final int type) {
+ applyLast();
+ mType = type;
+ }
+
+ public SpannableStringBuilder get() {
+ return mBuilder;
+ }
+
+ /**
+ * Create the span string.
+ *
+ * @return the span string
+ */
+ public SpannableStringBuilder create() {
+ applyLast();
+ if (mTextView != null) {
+ mTextView.setText(mBuilder);
+ }
+ isCreated = true;
+ return mBuilder;
+ }
+
+ private void applyLast() {
+ if (isCreated) {
+ return;
+ }
+ if (mType == mTypeCharSequence) {
+ updateCharCharSequence();
+ } else if (mType == mTypeImage) {
+ updateImage();
+ } else if (mType == mTypeSpace) {
+ updateSpace();
+ }
+ setDefault();
+ }
+
+ private void updateCharCharSequence() {
+ if (mText.length() == 0) return;
+ int start = mBuilder.length();
+ if (start == 0 && lineHeight != -1) {// bug of LineHeightSpan when first line
+ mBuilder.append(Character.toString((char) 2))
+ .append("\n")
+ .setSpan(new AbsoluteSizeSpan(0), 0, 2, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+ start = 2;
+ }
+ mBuilder.append(mText);
+ int end = mBuilder.length();
+ if (verticalAlign != -1) {
+ mBuilder.setSpan(new VerticalAlignSpan(verticalAlign), start, end, flag);
+ }
+ if (foregroundColor != COLOR_DEFAULT) {
+ mBuilder.setSpan(new ForegroundColorSpan(foregroundColor), start, end, flag);
+ }
+ if (backgroundColor != COLOR_DEFAULT) {
+ mBuilder.setSpan(new BackgroundColorSpan(backgroundColor), start, end, flag);
+ }
+ if (first != -1) {
+ mBuilder.setSpan(new LeadingMarginSpan.Standard(first, rest), start, end, flag);
+ }
+ if (quoteColor != COLOR_DEFAULT) {
+ mBuilder.setSpan(
+ new CustomQuoteSpan(quoteColor, stripeWidth, quoteGapWidth),
+ start,
+ end,
+ flag
+ );
+ }
+ if (bulletColor != COLOR_DEFAULT) {
+ mBuilder.setSpan(
+ new CustomBulletSpan(bulletColor, bulletRadius, bulletGapWidth),
+ start,
+ end,
+ flag
+ );
+ }
+ if (fontSize != -1) {
+ mBuilder.setSpan(new AbsoluteSizeSpan(fontSize, false), start, end, flag);
+ }
+ if (proportion != -1) {
+ mBuilder.setSpan(new RelativeSizeSpan(proportion), start, end, flag);
+ }
+ if (xProportion != -1) {
+ mBuilder.setSpan(new ScaleXSpan(xProportion), start, end, flag);
+ }
+ if (lineHeight != -1) {
+ mBuilder.setSpan(new CustomLineHeightSpan(lineHeight, alignLine), start, end, flag);
+ }
+ if (isStrikethrough) {
+ mBuilder.setSpan(new StrikethroughSpan(), start, end, flag);
+ }
+ if (isUnderline) {
+ mBuilder.setSpan(new UnderlineSpan(), start, end, flag);
+ }
+ if (isSuperscript) {
+ mBuilder.setSpan(new SuperscriptSpan(), start, end, flag);
+ }
+ if (isSubscript) {
+ mBuilder.setSpan(new SubscriptSpan(), start, end, flag);
+ }
+ if (isBold) {
+ mBuilder.setSpan(new StyleSpan(Typeface.BOLD), start, end, flag);
+ }
+ if (isItalic) {
+ mBuilder.setSpan(new StyleSpan(Typeface.ITALIC), start, end, flag);
+ }
+ if (isBoldItalic) {
+ mBuilder.setSpan(new StyleSpan(Typeface.BOLD_ITALIC), start, end, flag);
+ }
+ if (fontFamily != null) {
+ mBuilder.setSpan(new TypefaceSpan(fontFamily), start, end, flag);
+ }
+ if (typeface != null) {
+ mBuilder.setSpan(new CustomTypefaceSpan(typeface), start, end, flag);
+ }
+ if (alignment != null) {
+ mBuilder.setSpan(new AlignmentSpan.Standard(alignment), start, end, flag);
+ }
+ if (clickSpan != null) {
+ mBuilder.setSpan(clickSpan, start, end, flag);
+ }
+ if (url != null) {
+ mBuilder.setSpan(new URLSpan(url), start, end, flag);
+ }
+ if (blurRadius != -1) {
+ mBuilder.setSpan(
+ new MaskFilterSpan(new BlurMaskFilter(blurRadius, style)),
+ start,
+ end,
+ flag
+ );
+ }
+ if (shader != null) {
+ mBuilder.setSpan(new ShaderSpan(shader), start, end, flag);
+ }
+ if (shadowRadius != -1) {
+ mBuilder.setSpan(
+ new ShadowSpan(shadowRadius, shadowDx, shadowDy, shadowColor),
+ start,
+ end,
+ flag
+ );
+ }
+ if (spans != null) {
+ for (Object span : spans) {
+ mBuilder.setSpan(span, start, end, flag);
+ }
+ }
+ }
+
+ private void updateImage() {
+ int start = mBuilder.length();
+ mText = "![]()
";
+ updateCharCharSequence();
+ int end = mBuilder.length();
+ if (imageBitmap != null) {
+ mBuilder.setSpan(new CustomImageSpan(imageBitmap, alignImage), start, end, flag);
+ } else if (imageDrawable != null) {
+ mBuilder.setSpan(new CustomImageSpan(imageDrawable, alignImage), start, end, flag);
+ } else if (imageUri != null) {
+ mBuilder.setSpan(new CustomImageSpan(imageUri, alignImage), start, end, flag);
+ } else if (imageResourceId != -1) {
+ mBuilder.setSpan(new CustomImageSpan(imageResourceId, alignImage), start, end, flag);
+ }
+ }
+
+ private void updateSpace() {
+ int start = mBuilder.length();
+ mText = "< >";
+ updateCharCharSequence();
+ int end = mBuilder.length();
+ mBuilder.setSpan(new SpaceSpan(spaceSize, spaceColor), start, end, flag);
+ }
+
+ static class VerticalAlignSpan extends ReplacementSpan {
+
+ static final int ALIGN_CENTER = 2;
+ static final int ALIGN_TOP = 3;
+
+ final int mVerticalAlignment;
+
+ VerticalAlignSpan(int verticalAlignment) {
+ mVerticalAlignment = verticalAlignment;
+ }
+
+ @Override
+ public int getSize(@NonNull Paint paint, CharSequence text, int start, int end, @Nullable Paint.FontMetricsInt fm) {
+ text = text.subSequence(start, end);
+ return (int) paint.measureText(text.toString());
+ }
+
+ @Override
+ public void draw(@NonNull Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, @NonNull Paint paint) {
+ text = text.subSequence(start, end);
+ Paint.FontMetricsInt fm = paint.getFontMetricsInt();
+// int need = height - (v + fm.descent - fm.ascent - spanstartv);
+// if (need > 0) {
+// if (mVerticalAlignment == ALIGN_TOP) {
+// fm.descent += need;
+// } else if (mVerticalAlignment == ALIGN_CENTER) {
+// fm.descent += need / 2;
+// fm.ascent -= need / 2;
+// } else {
+// fm.ascent -= need;
+// }
+// }
+// need = height - (v + fm.bottom - fm.top - spanstartv);
+// if (need > 0) {
+// if (mVerticalAlignment == ALIGN_TOP) {
+// fm.bottom += need;
+// } else if (mVerticalAlignment == ALIGN_CENTER) {
+// fm.bottom += need / 2;
+// fm.top -= need / 2;
+// } else {
+// fm.top -= need;
+// }
+// }
+
+ canvas.drawText(text.toString(), x, y - ((y + fm.descent + y + fm.ascent) / 2 - (bottom + top) / 2), paint);
+ }
+ }
+
+ static class CustomLineHeightSpan implements LineHeightSpan {
+
+ private final int height;
+
+ static final int ALIGN_CENTER = 2;
+ static final int ALIGN_TOP = 3;
+
+ final int mVerticalAlignment;
+ static Paint.FontMetricsInt sfm;
+
+ CustomLineHeightSpan(int height, int verticalAlignment) {
+ this.height = height;
+ mVerticalAlignment = verticalAlignment;
+ }
+
+ @Override
+ public void chooseHeight(final CharSequence text, final int start, final int end,
+ final int spanstartv, final int v, final Paint.FontMetricsInt fm) {
+// LogUtils.e(fm, sfm);
+ if (sfm == null) {
+ sfm = new Paint.FontMetricsInt();
+ sfm.top = fm.top;
+ sfm.ascent = fm.ascent;
+ sfm.descent = fm.descent;
+ sfm.bottom = fm.bottom;
+ sfm.leading = fm.leading;
+ } else {
+ fm.top = sfm.top;
+ fm.ascent = sfm.ascent;
+ fm.descent = sfm.descent;
+ fm.bottom = sfm.bottom;
+ fm.leading = sfm.leading;
+ }
+ int need = height - (v + fm.descent - fm.ascent - spanstartv);
+ if (need > 0) {
+ if (mVerticalAlignment == ALIGN_TOP) {
+ fm.descent += need;
+ } else if (mVerticalAlignment == ALIGN_CENTER) {
+ fm.descent += need / 2;
+ fm.ascent -= need / 2;
+ } else {
+ fm.ascent -= need;
+ }
+ }
+ need = height - (v + fm.bottom - fm.top - spanstartv);
+ if (need > 0) {
+ if (mVerticalAlignment == ALIGN_TOP) {
+ fm.bottom += need;
+ } else if (mVerticalAlignment == ALIGN_CENTER) {
+ fm.bottom += need / 2;
+ fm.top -= need / 2;
+ } else {
+ fm.top -= need;
+ }
+ }
+ if (end == ((Spanned) text).getSpanEnd(this)) {
+ sfm = null;
+ }
+// LogUtils.e(fm, sfm);
+ }
+ }
+
+ static class SpaceSpan extends ReplacementSpan {
+
+ private final int width;
+ private final Paint paint = new Paint();
+
+ private SpaceSpan(final int width) {
+ this(width, Color.TRANSPARENT);
+ }
+
+ private SpaceSpan(final int width, final int color) {
+ super();
+ this.width = width;
+ paint.setColor(color);
+ paint.setStyle(Paint.Style.FILL);
+ }
+
+ @Override
+ public int getSize(@NonNull final Paint paint, final CharSequence text,
+ @IntRange(from = 0) final int start,
+ @IntRange(from = 0) final int end,
+ @Nullable final Paint.FontMetricsInt fm) {
+ return width;
+ }
+
+ @Override
+ public void draw(@NonNull final Canvas canvas, final CharSequence text,
+ @IntRange(from = 0) final int start,
+ @IntRange(from = 0) final int end,
+ final float x, final int top, final int y, final int bottom,
+ @NonNull final Paint paint) {
+ canvas.drawRect(x, top, x + width, bottom, this.paint);
+ }
+ }
+
+ static class CustomQuoteSpan implements LeadingMarginSpan {
+
+ private final int color;
+ private final int stripeWidth;
+ private final int gapWidth;
+
+ private CustomQuoteSpan(final int color, final int stripeWidth, final int gapWidth) {
+ super();
+ this.color = color;
+ this.stripeWidth = stripeWidth;
+ this.gapWidth = gapWidth;
+ }
+
+ public int getLeadingMargin(final boolean first) {
+ return stripeWidth + gapWidth;
+ }
+
+ public void drawLeadingMargin(final Canvas c, final Paint p, final int x, final int dir,
+ final int top, final int baseline, final int bottom,
+ final CharSequence text, final int start, final int end,
+ final boolean first, final Layout layout) {
+ Paint.Style style = p.getStyle();
+ int color = p.getColor();
+
+ p.setStyle(Paint.Style.FILL);
+ p.setColor(this.color);
+
+ c.drawRect(x, top, x + dir * stripeWidth, bottom, p);
+
+ p.setStyle(style);
+ p.setColor(color);
+ }
+ }
+
+ static class CustomBulletSpan implements LeadingMarginSpan {
+
+ private final int color;
+ private final int radius;
+ private final int gapWidth;
+
+ private Path sBulletPath = null;
+
+ private CustomBulletSpan(final int color, final int radius, final int gapWidth) {
+ this.color = color;
+ this.radius = radius;
+ this.gapWidth = gapWidth;
+ }
+
+ public int getLeadingMargin(final boolean first) {
+ return 2 * radius + gapWidth;
+ }
+
+ public void drawLeadingMargin(final Canvas c, final Paint p, final int x, final int dir,
+ final int top, final int baseline, final int bottom,
+ final CharSequence text, final int start, final int end,
+ final boolean first, final Layout l) {
+ if (((Spanned) text).getSpanStart(this) == start) {
+ Paint.Style style = p.getStyle();
+ int oldColor = 0;
+ oldColor = p.getColor();
+ p.setColor(color);
+ p.setStyle(Paint.Style.FILL);
+ if (c.isHardwareAccelerated()) {
+ if (sBulletPath == null) {
+ sBulletPath = new Path();
+ // Bullet is slightly better to avoid aliasing artifacts on mdpi devices.
+ sBulletPath.addCircle(0.0f, 0.0f, radius, Path.Direction.CW);
+ }
+ c.save();
+ c.translate(x + dir * radius, (top + bottom) / 2.0f);
+ c.drawPath(sBulletPath, p);
+ c.restore();
+ } else {
+ c.drawCircle(x + dir * radius, (top + bottom) / 2.0f, radius, p);
+ }
+ p.setColor(oldColor);
+ p.setStyle(style);
+ }
+ }
+ }
+
+ @SuppressLint("ParcelCreator")
+ static class CustomTypefaceSpan extends TypefaceSpan {
+
+ private final Typeface newType;
+
+ private CustomTypefaceSpan(final Typeface type) {
+ super("");
+ newType = type;
+ }
+
+ @Override
+ public void updateDrawState(final TextPaint textPaint) {
+ apply(textPaint, newType);
+ }
+
+ @Override
+ public void updateMeasureState(final TextPaint paint) {
+ apply(paint, newType);
+ }
+
+ private void apply(final Paint paint, final Typeface tf) {
+ int oldStyle;
+ Typeface old = paint.getTypeface();
+ if (old == null) {
+ oldStyle = 0;
+ } else {
+ oldStyle = old.getStyle();
+ }
+
+ int fake = oldStyle & ~tf.getStyle();
+ if ((fake & Typeface.BOLD) != 0) {
+ paint.setFakeBoldText(true);
+ }
+
+ if ((fake & Typeface.ITALIC) != 0) {
+ paint.setTextSkewX(-0.25f);
+ }
+
+ paint.getShader();
+
+ paint.setTypeface(tf);
+ }
+ }
+
+ static class CustomImageSpan extends CustomDynamicDrawableSpan {
+ private Drawable mDrawable;
+ private Uri mContentUri;
+ private int mResourceId;
+
+ private CustomImageSpan(final Bitmap b, final int verticalAlignment) {
+ super(verticalAlignment);
+ mDrawable = new BitmapDrawable(AppUtils.getApp().getResources(), b);
+ mDrawable.setBounds(
+ 0, 0, mDrawable.getIntrinsicWidth(), mDrawable.getIntrinsicHeight()
+ );
+ }
+
+ private CustomImageSpan(final Drawable d, final int verticalAlignment) {
+ super(verticalAlignment);
+ mDrawable = d;
+ mDrawable.setBounds(
+ 0, 0, mDrawable.getIntrinsicWidth(), mDrawable.getIntrinsicHeight()
+ );
+ }
+
+ private CustomImageSpan(final Uri uri, final int verticalAlignment) {
+ super(verticalAlignment);
+ mContentUri = uri;
+ }
+
+ private CustomImageSpan(@DrawableRes final int resourceId, final int verticalAlignment) {
+ super(verticalAlignment);
+ mResourceId = resourceId;
+ }
+
+ @Override
+ public Drawable getDrawable() {
+ Drawable drawable = null;
+ if (mDrawable != null) {
+ drawable = mDrawable;
+ } else if (mContentUri != null) {
+ Bitmap bitmap;
+ try {
+ InputStream is =
+ AppUtils.getApp().getContentResolver().openInputStream(mContentUri);
+ bitmap = BitmapFactory.decodeStream(is);
+ drawable = new BitmapDrawable(AppUtils.getApp().getResources(), bitmap);
+ drawable.setBounds(
+ 0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()
+ );
+ if (is != null) {
+ is.close();
+ }
+ } catch (Exception e) {
+ Log.e("sms", "Failed to loaded content " + mContentUri, e);
+ }
+ } else {
+ try {
+ drawable = ContextCompat.getDrawable(AppUtils.getApp(), mResourceId);
+ drawable.setBounds(
+ 0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()
+ );
+ } catch (Exception e) {
+ Log.e("sms", "Unable to find resource: " + mResourceId);
+ }
+ }
+ return drawable;
+ }
+ }
+
+ static abstract class CustomDynamicDrawableSpan extends ReplacementSpan {
+
+ static final int ALIGN_BOTTOM = 0;
+
+ static final int ALIGN_BASELINE = 1;
+
+ static final int ALIGN_CENTER = 2;
+
+ static final int ALIGN_TOP = 3;
+
+ final int mVerticalAlignment;
+
+ private CustomDynamicDrawableSpan() {
+ mVerticalAlignment = ALIGN_BOTTOM;
+ }
+
+ private CustomDynamicDrawableSpan(final int verticalAlignment) {
+ mVerticalAlignment = verticalAlignment;
+ }
+
+ public abstract Drawable getDrawable();
+
+ @Override
+ public int getSize(@NonNull final Paint paint, final CharSequence text,
+ final int start, final int end, final Paint.FontMetricsInt fm) {
+ Drawable d = getCachedDrawable();
+ Rect rect = d.getBounds();
+ if (fm != null) {
+// LogUtils.d("fm.top: " + fm.top,
+// "fm.ascent: " + fm.ascent,
+// "fm.descent: " + fm.descent,
+// "fm.bottom: " + fm.bottom,
+// "lineHeight: " + (fm.bottom - fm.top));
+ int lineHeight = fm.bottom - fm.top;
+ if (lineHeight < rect.height()) {
+ if (mVerticalAlignment == ALIGN_TOP) {
+ fm.top = fm.top;
+ fm.bottom = rect.height() + fm.top;
+ } else if (mVerticalAlignment == ALIGN_CENTER) {
+ fm.top = -rect.height() / 2 - lineHeight / 4;
+ fm.bottom = rect.height() / 2 - lineHeight / 4;
+ } else {
+ fm.top = -rect.height() + fm.bottom;
+ fm.bottom = fm.bottom;
+ }
+ fm.ascent = fm.top;
+ fm.descent = fm.bottom;
+ }
+ }
+ return rect.right;
+ }
+
+ @Override
+ public void draw(@NonNull final Canvas canvas, final CharSequence text,
+ final int start, final int end, final float x,
+ final int top, final int y, final int bottom, @NonNull final Paint paint) {
+ Drawable d = getCachedDrawable();
+ Rect rect = d.getBounds();
+ canvas.save();
+ float transY;
+ int lineHeight = bottom - top;
+// LogUtils.d("rectHeight: " + rect.height(),
+// "lineHeight: " + (bottom - top));
+ if (rect.height() < lineHeight) {
+ if (mVerticalAlignment == ALIGN_TOP) {
+ transY = top;
+ } else if (mVerticalAlignment == ALIGN_CENTER) {
+ transY = (bottom + top - rect.height()) / 2;
+ } else if (mVerticalAlignment == ALIGN_BASELINE) {
+ transY = y - rect.height();
+ } else {
+ transY = bottom - rect.height();
+ }
+ canvas.translate(x, transY);
+ } else {
+ canvas.translate(x, top);
+ }
+ d.draw(canvas);
+ canvas.restore();
+ }
+
+ private Drawable getCachedDrawable() {
+ WeakReference wr = mDrawableRef;
+ Drawable d = null;
+ if (wr != null) {
+ d = wr.get();
+ }
+ if (d == null) {
+ d = getDrawable();
+ mDrawableRef = new WeakReference<>(d);
+ }
+ return d;
+ }
+
+ private WeakReference mDrawableRef;
+ }
+
+ static class ShaderSpan extends CharacterStyle implements UpdateAppearance {
+ private Shader mShader;
+
+ private ShaderSpan(final Shader shader) {
+ this.mShader = shader;
+ }
+
+ @Override
+ public void updateDrawState(final TextPaint tp) {
+ tp.setShader(mShader);
+ }
+ }
+
+ static class ShadowSpan extends CharacterStyle implements UpdateAppearance {
+ private float radius;
+ private float dx, dy;
+ private int shadowColor;
+
+ private ShadowSpan(final float radius,
+ final float dx,
+ final float dy,
+ final int shadowColor) {
+ this.radius = radius;
+ this.dx = dx;
+ this.dy = dy;
+ this.shadowColor = shadowColor;
+ }
+
+ @Override
+ public void updateDrawState(final TextPaint tp) {
+ tp.setShadowLayer(radius, dx, dy, shadowColor);
+ }
+ }
+
+ private static class SerializableSpannableStringBuilder extends SpannableStringBuilder
+ implements Serializable {
+
+ private static final long serialVersionUID = 4909567650765875771L;
+ }
+}
diff --git a/core/src/main/java/com/chwl/core/vip/VipModel.kt b/core/src/main/java/com/chwl/core/vip/VipModel.kt
index bfcd76ae8..14ac64818 100644
--- a/core/src/main/java/com/chwl/core/vip/VipModel.kt
+++ b/core/src/main/java/com/chwl/core/vip/VipModel.kt
@@ -57,7 +57,7 @@ object VipModel : BaseModel() {
*
* @return
*/
- @GET("vip/getVipPageInfo")
+ @GET("vip/v2/getVipPageInfo")
suspend fun getVipPageInfo(): ServiceResult
diff --git a/core/src/model_music/java/com/chwl/core/music/model/IPlayerModel.java b/core/src/model_music/java/com/chwl/core/music/model/IPlayerModel.java
index f6123dd84..35f1333f7 100644
--- a/core/src/model_music/java/com/chwl/core/music/model/IPlayerModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/model/IPlayerModel.java
@@ -60,6 +60,8 @@ public interface IPlayerModel extends IModel{
void seekRecordingVolume(int volume);
+ void seekRecordingVolumeForTemp(int volume);
+
int getCurrentVolume();
int getCurrentRecordingVolume();
diff --git a/core/src/model_music/java/com/chwl/core/music/model/PlayerModel.java b/core/src/model_music/java/com/chwl/core/music/model/PlayerModel.java
index 0568a9234..59c4cf635 100644
--- a/core/src/model_music/java/com/chwl/core/music/model/PlayerModel.java
+++ b/core/src/model_music/java/com/chwl/core/music/model/PlayerModel.java
@@ -284,6 +284,11 @@ public class PlayerModel extends BaseModel implements IPlayerModel {
AudioEngineManager.get().adjustRecordingSignalVolume(volume);
}
+ @Override
+ public void seekRecordingVolumeForTemp(int volume) {
+ AudioEngineManager.get().adjustRecordingSignalVolume(volume);
+ }
+
@Override
public int getCurrentVolume() {
return volume;
diff --git a/library/src/main/java/com/chwl/library/utils/ResUtil.java b/library/src/main/java/com/chwl/library/utils/ResUtil.java
index 91954d3c3..0cde4ef69 100644
--- a/library/src/main/java/com/chwl/library/utils/ResUtil.java
+++ b/library/src/main/java/com/chwl/library/utils/ResUtil.java
@@ -3,7 +3,10 @@ package com.chwl.library.utils;
import android.app.Application;
import android.content.Context;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
import androidx.core.util.Supplier;
@@ -25,4 +28,24 @@ public class ResUtil {
}
return context.getString(resId);
}
+
+ public static String getString(@StringRes int resId,Object... vars) {
+ if (contextSupplier != null) {
+ Context context1 = contextSupplier.get();
+ if (context1 != null) {
+ return context1.getString(resId,vars);
+ }
+ }
+ return context.getString(resId,vars);
+ }
+
+ public static int getColor(@ColorRes int resId){
+ if (contextSupplier != null) {
+ Context context1 = contextSupplier.get();
+ if (context1 != null) {
+ return ContextCompat.getColor(context1, resId);
+ }
+ }
+ return ContextCompat.getColor(context, resId);
+ }
}
diff --git a/library/src/main/java/com/chwl/library/widget/SVGAView.kt b/library/src/main/java/com/chwl/library/widget/SVGAView.kt
index 24a4c1990..fd8d33a57 100644
--- a/library/src/main/java/com/chwl/library/widget/SVGAView.kt
+++ b/library/src/main/java/com/chwl/library/widget/SVGAView.kt
@@ -9,6 +9,7 @@ import com.chwl.library.download.DownloadManager.download
import com.chwl.library.download.DownloadRequest.Companion.build
import com.chwl.library.download.DownloadTask
import com.chwl.library.download.FileDownloadListener
+import com.chwl.library.utils.LogUtil
import com.chwl.library.utils.PathHelper
import com.example.lib_utils.AppUtils
import com.example.lib_utils.log.ILog
@@ -19,6 +20,7 @@ import com.opensource.svgaplayer.SVGAParser.Companion.shareParser
import com.opensource.svgaplayer.SVGAVideoEntity
import java.io.BufferedInputStream
import java.io.FileInputStream
+import java.net.MalformedURLException
class SVGAView : SVGAImageView, ILog {
companion object {
@@ -56,6 +58,25 @@ class SVGAView : SVGAImageView, ILog {
defStyleAttr
)
+ fun loadFile(name: String) {
+ try {
+ SVGAParser.shareParser()
+ .decodeFromAssets(name, object : SVGAParser.ParseCompletion {
+ override fun onComplete(videoItem: SVGAVideoEntity) {
+ val drawable = SVGADrawable(videoItem)
+ setImageDrawable(drawable)
+ startAnimation()
+ }
+
+ override fun onError() {
+ LogUtil.print("onError")
+ }
+ })
+ } catch (e: MalformedURLException) {
+
+ }
+ }
+
fun loadUrl(url: String?) {
logD("loadUrl() url:$url")
if (url.isNullOrEmpty()) {
diff --git a/library/src/module_common/java/com/chwl/library/common/base/BaseLinearLayout.java b/library/src/module_common/java/com/chwl/library/common/base/BaseLinearLayout.java
index 8ac9cd1bb..9c2a138f3 100644
--- a/library/src/module_common/java/com/chwl/library/common/base/BaseLinearLayout.java
+++ b/library/src/module_common/java/com/chwl/library/common/base/BaseLinearLayout.java
@@ -39,7 +39,7 @@ public abstract class BaseLinearLayout extends LinearLay
}
private void init() {
- mViewBinding = ViewBindingUtil.inflateWithView(this, LayoutInflater.from(getContext()), this);
+ mViewBinding = ViewBindingUtil.inflateWithView(this, LayoutInflater.from(getContext()), this,true);
BaseViewTag.registerLifecycle(this);
findView();
}
diff --git a/library/src/module_common/java/com/chwl/library/common/util/ViewBindingUtil.kt b/library/src/module_common/java/com/chwl/library/common/util/ViewBindingUtil.kt
index 97be55586..62296ed96 100644
--- a/library/src/module_common/java/com/chwl/library/common/util/ViewBindingUtil.kt
+++ b/library/src/module_common/java/com/chwl/library/common/util/ViewBindingUtil.kt
@@ -40,11 +40,12 @@ object ViewBindingUtil {
genericOwner: Any,
layoutInflater: LayoutInflater,
parent: ViewGroup?,
+ isAttach:Boolean = true
): VB? = withGenericBindingClass(genericOwner) { clazz ->
var vb = try {
clazz.getMethod(
"inflate", LayoutInflater::class.java, ViewGroup::class.java, Boolean::class.java
- ).invoke(null, layoutInflater, parent, true) as? VB
+ ).invoke(null, layoutInflater, parent, isAttach) as? VB
} catch (e: Exception) {
//merge 标签会找不到
LibLogger.debug(
diff --git a/libs/lib_utils/src/main/java/com/example/lib_utils/ktx/ResourcesKtx.kt b/libs/lib_utils/src/main/java/com/example/lib_utils/ktx/ResourcesKtx.kt
index 3e5f51c82..d86d9bed8 100644
--- a/libs/lib_utils/src/main/java/com/example/lib_utils/ktx/ResourcesKtx.kt
+++ b/libs/lib_utils/src/main/java/com/example/lib_utils/ktx/ResourcesKtx.kt
@@ -73,21 +73,21 @@ fun Any.getStringById(@StringRes stringResId: Int): String {
/**
* 获取字符串资源
*/
-fun Int.toStringRes(): String {
+fun Int.getString(): String {
return AppUtils.getApp().getString(this)
}
/**
* 获取资源drawable
* */
-fun Int.toDrawableRes(): Drawable? {
+fun Int.getDrawable(): Drawable? {
return ContextCompat.getDrawable(AppUtils.getApp(), this)
}
/**
* 获取资源color
* */
-fun Int.toColorRes(): Int {
+fun Int.getColor(): Int {
return ContextCompat.getColor(AppUtils.getApp(), this)
}
diff --git a/modules/module_base/src/main/res/drawable/base_shape_border_theme_23dp.xml b/modules/module_base/src/main/res/drawable/base_shape_border_theme_23dp.xml
index f543adaa2..c1c85e01a 100644
--- a/modules/module_base/src/main/res/drawable/base_shape_border_theme_23dp.xml
+++ b/modules/module_base/src/main/res/drawable/base_shape_border_theme_23dp.xml
@@ -1,24 +1,6 @@
-
+
+
+
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/drawable/base_shape_theme_23dp.xml b/modules/module_base/src/main/res/drawable/base_shape_theme_23dp.xml
index 32d95f99d..9e1572e49 100644
--- a/modules/module_base/src/main/res/drawable/base_shape_theme_23dp.xml
+++ b/modules/module_base/src/main/res/drawable/base_shape_theme_23dp.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/drawable/user_info_follow_ed.xml b/modules/module_base/src/main/res/drawable/user_info_follow_ed.xml
new file mode 100644
index 000000000..1d64d9b51
--- /dev/null
+++ b/modules/module_base/src/main/res/drawable/user_info_follow_ed.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/module_base/src/main/res/drawable/user_info_follow_n.xml b/modules/module_base/src/main/res/drawable/user_info_follow_n.xml
new file mode 100644
index 000000000..9e1572e49
--- /dev/null
+++ b/modules/module_base/src/main/res/drawable/user_info_follow_n.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file